Qhull: headers diff between 2011.1 and 2012.1 versions

	Coordinates.h	Coordinates.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (c) 2009-2011 C.B. Barber. All rights reserved.	** Copyright (c) 2009-2012 C.B. Barber. All rights reserved.
	** $Id: //main/2011/qhull/src/libqhullcpp/Coordinates.h#5 $$Change: 1382 $	** $Id: //main/2011/qhull/src/libqhullcpp/Coordinates.h#6 $$Change: 1464 $
	** $DateTime: 2011/05/14 10:45:42 $$Author: bbarber $	** $DateTime: 2012/01/25 22:58:41 $$Author: bbarber $
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QHCOORDINATES_H	#ifndef QHCOORDINATES_H
	#define QHCOORDINATES_H	#define QHCOORDINATES_H

	#include "QhullError.h"	#include "QhullError.h"
	#include "QhullIterator.h"	#include "QhullIterator.h"
	extern "C" {	extern "C" {
	#include "libqhull/qhull_a.h"	#include "libqhull/qhull_a.h"

End of changes. 1 change blocks.
	3 lines changed or deleted	3 lines changed or added

	PointCoordinates.h	PointCoordinates.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (c) 2009-2011 C.B. Barber. All rights reserved.	** Copyright (c) 2009-2012 C.B. Barber. All rights reserved.
	** $Id: //main/2011/qhull/src/libqhullcpp/PointCoordinates.h#4 $$Change: 13	** $Id: //main/2011/qhull/src/libqhullcpp/PointCoordinates.h#5 $$Change: 14
	48 $	64 $
	** $DateTime: 2011/03/25 23:54:58 $$Author: bbarber $	** $DateTime: 2012/01/25 22:58:41 $$Author: bbarber $
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QHPOINTCOORDINATES_H	#ifndef QHPOINTCOORDINATES_H
	#define QHPOINTCOORDINATES_H	#define QHPOINTCOORDINATES_H

	#include "QhullPoints.h"	#include "QhullPoints.h"
	#include "Coordinates.h"	#include "Coordinates.h"
	extern "C" {	extern "C" {
	#include "libqhull/qhull_a.h"	#include "libqhull/qhull_a.h"

End of changes. 1 change blocks.
	4 lines changed or deleted	4 lines changed or added

	Qhull.h	Qhull.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (c) 2008-2011 C.B. Barber. All rights reserved.	** Copyright (c) 2008-2012 C.B. Barber. All rights reserved.
	** $Id: //main/2011/qhull/src/libqhullcpp/Qhull.h#3 $$Change: 1348 $	** $Id: //main/2011/qhull/src/libqhullcpp/Qhull.h#4 $$Change: 1464 $
	** $DateTime: 2011/03/25 23:54:58 $$Author: bbarber $	** $DateTime: 2012/01/25 22:58:41 $$Author: bbarber $
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QHULLCPP_H	#ifndef QHULLCPP_H
	#define QHULLCPP_H	#define QHULLCPP_H

	#include "QhullQh.h"	#include "QhullQh.h"
	#include "RboxPoints.h"	#include "RboxPoints.h"
	#include "QhullLinkedList.h"	#include "QhullLinkedList.h"
	#include "QhullPoint.h"	#include "QhullPoint.h"

End of changes. 1 change blocks.
	3 lines changed or deleted	3 lines changed or added

	QhullError.h	QhullError.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (c) 2008-2011 C.B. Barber. All rights reserved.	** Copyright (c) 2008-2012 C.B. Barber. All rights reserved.
	** $Id: //main/2011/qhull/src/libqhullcpp/QhullError.h#3 $$Change: 1356 $	** $Id: //main/2011/qhull/src/libqhullcpp/QhullError.h#5 $$Change: 1490 $
	** $DateTime: 2011/04/03 09:01:22 $$Author: bbarber $	** $DateTime: 2012/02/19 20:27:01 $$Author: bbarber $
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QHULLERROR_H	#ifndef QHULLERROR_H
	#define QHULLERROR_H	#define QHULLERROR_H


	#include "road/RoadError.h"	#include "RoadError.h"

	#include <assert.h>	#include <assert.h>
	#include <stdexcept>	#include <stdexcept>
	#include <string>	#include <string>

	namespace orgQhull {	namespace orgQhull {

	#//Types	#//Types
	//! QhullError -- std::exception class for Qhull	//! QhullError -- std::exception class for Qhull
	class QhullError;	class QhullError;

End of changes. 2 change blocks.
	4 lines changed or deleted	4 lines changed or added

	QhullFacet.h	QhullFacet.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (c) 2008-2011 C.B. Barber. All rights reserved.	** Copyright (c) 2008-2012 C.B. Barber. All rights reserved.
	** $Id: //main/2011/qhull/src/libqhullcpp/QhullFacet.h#6 $$Change: 1372 $	** $Id: //main/2011/qhull/src/libqhullcpp/QhullFacet.h#7 $$Change: 1464 $
	** $DateTime: 2011/04/17 19:32:21 $$Author: bbarber $	** $DateTime: 2012/01/25 22:58:41 $$Author: bbarber $
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QHULLFACET_H	#ifndef QHULLFACET_H
	#define QHULLFACET_H	#define QHULLFACET_H

	#include "Coordinates.h"	#include "Coordinates.h"
	#include "QhullHyperplane.h"	#include "QhullHyperplane.h"
	#include "QhullPoint.h"	#include "QhullPoint.h"
	#include "QhullSet.h"	#include "QhullSet.h"

End of changes. 1 change blocks.
	3 lines changed or deleted	3 lines changed or added

	QhullFacetList.h	QhullFacetList.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (c) 2008-2011 C.B. Barber. All rights reserved.	** Copyright (c) 2008-2012 C.B. Barber. All rights reserved.
	** $Id: //main/2011/qhull/src/libqhullcpp/QhullFacetList.h#2 $$Change: 1342	** $Id: //main/2011/qhull/src/libqhullcpp/QhullFacetList.h#3 $$Change: 1464
	$	$
	** $DateTime: 2011/03/07 21:55:47 $$Author: bbarber $	** $DateTime: 2012/01/25 22:58:41 $$Author: bbarber $
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QHULLFACETLIST_H	#ifndef QHULLFACETLIST_H
	#define QHULLFACETLIST_H	#define QHULLFACETLIST_H

	#include "QhullLinkedList.h"	#include "QhullLinkedList.h"
	#include "QhullFacet.h"	#include "QhullFacet.h"

	#include <ostream>	#include <ostream>

End of changes. 1 change blocks.
	4 lines changed or deleted	4 lines changed or added

	QhullFacetSet.h	QhullFacetSet.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (c) 2008-2011 C.B. Barber. All rights reserved.	** Copyright (c) 2008-2012 C.B. Barber. All rights reserved.
	** $Id: //main/2011/qhull/src/libqhullcpp/QhullFacetSet.h#4 $$Change: 1382	** $Id: //main/2011/qhull/src/libqhullcpp/QhullFacetSet.h#5 $$Change: 1464
	$	$
	** $DateTime: 2011/05/14 10:45:42 $$Author: bbarber $	** $DateTime: 2012/01/25 22:58:41 $$Author: bbarber $
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QHULLFACETSET_H	#ifndef QHULLFACETSET_H
	#define QHULLFACETSET_H	#define QHULLFACETSET_H

	#include "QhullSet.h"	#include "QhullSet.h"

	#include <ostream>	#include <ostream>


End of changes. 1 change blocks.
	4 lines changed or deleted	4 lines changed or added

	QhullHyperplane.h	QhullHyperplane.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (c) 2009-2011 C.B. Barber. All rights reserved.	** Copyright (c) 2009-2012 C.B. Barber. All rights reserved.
	** $Id: //main/2011/qhull/src/libqhullcpp/QhullHyperplane.h#5 $$Change: 138	** $Id: //main/2011/qhull/src/libqhullcpp/QhullHyperplane.h#6 $$Change: 146
	2 $	4 $
	** $DateTime: 2011/05/14 10:45:42 $$Author: bbarber $	** $DateTime: 2012/01/25 22:58:41 $$Author: bbarber $
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QHHYPERPLANE_H	#ifndef QHHYPERPLANE_H
	#define QHHYPERPLANE_H	#define QHHYPERPLANE_H

	#include "QhullError.h"	#include "QhullError.h"
	#include "QhullIterator.h"	#include "QhullIterator.h"
	#include "UsingLibQhull.h"	#include "UsingLibQhull.h"
	extern "C" {	extern "C" {

End of changes. 1 change blocks.
	4 lines changed or deleted	4 lines changed or added

	QhullIterator.h	QhullIterator.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (c) 2008-2011 C.B. Barber. All rights reserved.	** Copyright (c) 2008-2012 C.B. Barber. All rights reserved.
	** $Id: //main/2011/qhull/src/libqhullcpp/QhullIterator.h#5 $$Change: 1382	** $Id: //main/2011/qhull/src/libqhullcpp/QhullIterator.h#6 $$Change: 1464
	$	$
	** $DateTime: 2011/05/14 10:45:42 $$Author: bbarber $	** $DateTime: 2012/01/25 22:58:41 $$Author: bbarber $
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QHULLITERATOR_H	#ifndef QHULLITERATOR_H
	#define QHULLITERATOR_H	#define QHULLITERATOR_H

	extern "C" {	extern "C" {
	#include "libqhull/qhull_a.h"	#include "libqhull/qhull_a.h"
	}	}


End of changes. 1 change blocks.
	4 lines changed or deleted	4 lines changed or added

	QhullLinkedList.h	QhullLinkedList.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (c) 2008-2011 C.B. Barber. All rights reserved.	** Copyright (c) 2008-2012 C.B. Barber. All rights reserved.
	** $Id: //main/2011/qhull/src/libqhullcpp/QhullLinkedList.h#2 $$Change: 134	** $Id: //main/2011/qhull/src/libqhullcpp/QhullLinkedList.h#3 $$Change: 146
	2 $	4 $
	** $DateTime: 2011/03/07 21:55:47 $$Author: bbarber $	** $DateTime: 2012/01/25 22:58:41 $$Author: bbarber $
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QHULLLINKEDLIST_H	#ifndef QHULLLINKEDLIST_H
	#define QHULLLINKEDLIST_H	#define QHULLLINKEDLIST_H

	namespace std { struct bidirectional_iterator_tag; struct random_access_ite rator_tag; }	namespace std { struct bidirectional_iterator_tag; struct random_access_ite rator_tag; }

	#include "QhullError.h"	#include "QhullError.h"


End of changes. 1 change blocks.
	4 lines changed or deleted	4 lines changed or added

	QhullPoint.h	QhullPoint.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (c) 2009-2011 C.B. Barber. All rights reserved.	** Copyright (c) 2009-2012 C.B. Barber. All rights reserved.
	** $Id: //main/2011/qhull/src/libqhullcpp/QhullPoint.h#5 $$Change: 1382 $	** $Id: //main/2011/qhull/src/libqhullcpp/QhullPoint.h#6 $$Change: 1464 $
	** $DateTime: 2011/05/14 10:45:42 $$Author: bbarber $	** $DateTime: 2012/01/25 22:58:41 $$Author: bbarber $
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QHPOINT_H	#ifndef QHPOINT_H
	#define QHPOINT_H	#define QHPOINT_H

	#include "QhullError.h"	#include "QhullError.h"
	#include "QhullIterator.h"	#include "QhullIterator.h"
	#include "UsingLibQhull.h"	#include "UsingLibQhull.h"
	#include "Coordinates.h"	#include "Coordinates.h"

End of changes. 1 change blocks.
	3 lines changed or deleted	3 lines changed or added

	QhullPointSet.h	QhullPointSet.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (c) 2009-2011 C.B. Barber. All rights reserved.	** Copyright (c) 2009-2012 C.B. Barber. All rights reserved.
	** $Id: //main/2011/qhull/src/libqhullcpp/QhullPointSet.h#5 $$Change: 1382	** $Id: //main/2011/qhull/src/libqhullcpp/QhullPointSet.h#6 $$Change: 1464
	$	$
	** $DateTime: 2011/05/14 10:45:42 $$Author: bbarber $	** $DateTime: 2012/01/25 22:58:41 $$Author: bbarber $
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QHULLPOINTSET_H	#ifndef QHULLPOINTSET_H
	#define QHULLPOINTSET_H	#define QHULLPOINTSET_H

	#include "QhullSet.h"	#include "QhullSet.h"
	#include "QhullPoint.h"	#include "QhullPoint.h"
	extern "C" {	extern "C" {
	#include "libqhull/qhull_a.h"	#include "libqhull/qhull_a.h"

End of changes. 1 change blocks.
	4 lines changed or deleted	4 lines changed or added

	QhullPoints.h	QhullPoints.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (c) 2009-2011 C.B. Barber. All rights reserved.	** Copyright (c) 2009-2012 C.B. Barber. All rights reserved.
	** $Id: //main/2011/qhull/src/libqhullcpp/QhullPoints.h#4 $$Change: 1348 $	** $Id: //main/2011/qhull/src/libqhullcpp/QhullPoints.h#5 $$Change: 1464 $
	** $DateTime: 2011/03/25 23:54:58 $$Author: bbarber $	** $DateTime: 2012/01/25 22:58:41 $$Author: bbarber $
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QHULLPOINTS_H	#ifndef QHULLPOINTS_H
	#define QHULLPOINTS_H	#define QHULLPOINTS_H

	#include "QhullPoint.h"	#include "QhullPoint.h"
	extern "C" {	extern "C" {
	#include "libqhull/qhull_a.h"	#include "libqhull/qhull_a.h"
	}	}

End of changes. 1 change blocks.
	3 lines changed or deleted	3 lines changed or added

	QhullQh.h	QhullQh.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (c) 2008-2011 C.B. Barber. All rights reserved.	** Copyright (c) 2008-2012 C.B. Barber. All rights reserved.
	** $Id: //main/2011/qhull/src/libqhullcpp/QhullQh.h#5 $$Change: 1382 $	** $Id: //main/2011/qhull/src/libqhullcpp/QhullQh.h#6 $$Change: 1464 $
	** $DateTime: 2011/05/14 10:45:42 $$Author: bbarber $	** $DateTime: 2012/01/25 22:58:41 $$Author: bbarber $
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QHULLQH_H	#ifndef QHULLQH_H
	#define QHULLQH_H	#define QHULLQH_H

	extern "C" {	extern "C" {
	#include "libqhull/qhull_a.h"	#include "libqhull/qhull_a.h"
	}	}


End of changes. 1 change blocks.
	3 lines changed or deleted	3 lines changed or added

	QhullRidge.h	QhullRidge.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (c) 2008-2011 C.B. Barber. All rights reserved.	** Copyright (c) 2008-2012 C.B. Barber. All rights reserved.
	** $Id: //main/2011/qhull/src/libqhullcpp/QhullRidge.h#5 $$Change: 1352 $	** $Id: //main/2011/qhull/src/libqhullcpp/QhullRidge.h#6 $$Change: 1464 $
	** $DateTime: 2011/03/27 18:16:41 $$Author: bbarber $	** $DateTime: 2012/01/25 22:58:41 $$Author: bbarber $
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QHULLRIDGE_H	#ifndef QHULLRIDGE_H
	#define QHULLRIDGE_H	#define QHULLRIDGE_H

	#include "QhullSet.h"	#include "QhullSet.h"
	#include "QhullVertex.h"	#include "QhullVertex.h"
	#include "QhullVertexSet.h"	#include "QhullVertexSet.h"
	#include "QhullFacet.h"	#include "QhullFacet.h"

End of changes. 1 change blocks.
	3 lines changed or deleted	3 lines changed or added

	QhullSet.h	QhullSet.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (c) 2008-2011 C.B. Barber. All rights reserved.	** Copyright (c) 2008-2012 C.B. Barber. All rights reserved.
	** $Id: //main/2011/qhull/src/libqhullcpp/QhullSet.h#5 $$Change: 1382 $	** $Id: //main/2011/qhull/src/libqhullcpp/QhullSet.h#7 $$Change: 1464 $
	** $DateTime: 2011/05/14 10:45:42 $$Author: bbarber $	** $DateTime: 2012/01/25 22:58:41 $$Author: bbarber $
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QhullSet_H	#ifndef QhullSet_H
	#define QhullSet_H	#define QhullSet_H

	#include "QhullError.h"	#include "QhullError.h"
	extern "C" {	extern "C" {
	#include "libqhull/qhull_a.h"	#include "libqhull/qhull_a.h"
	}	}

	skipping to change at line 86	skipping to change at line 86
	int count() const { return QhullSetBase::count(qh_set); }	int count() const { return QhullSetBase::count(qh_set); }
	bool empty() const { return SETfirst_(qh_set)==0; }	bool empty() const { return SETfirst_(qh_set)==0; }
	bool isEmpty() const { return empty(); }	bool isEmpty() const { return empty(); }
	size_t size() const { return count(); }	size_t size() const { return count(); }

	#//Element	#//Element
	protected:	protected:
	void **beginPointer() const { return &qh_set->e[0].p; }	void **beginPointer() const { return &qh_set->e[0].p; }
	void **elementPointer(int idx) const { QHULL_ASSERT(idx>=0 && idx<qh_set->maxsize); return &SETelem_(qh_set, idx); }	void **elementPointer(int idx) const { QHULL_ASSERT(idx>=0 && idx<qh_set->maxsize); return &SETelem_(qh_set, idx); }
	//! Always points to 0	//! Always points to 0

	void *endPointer() const { int i=SETsizeaddr_(qh_set); r eturn (i ? &qh_set->e[(i)-1].p : reinterpret_cast<void **>(i)); }	void **endPointer() const { return qh_setendpointer(qh_set ); }
	};//QhullSetBase	};//QhullSetBase

	//! set of pointers to baseT, T.getBaseT()	//! set of pointers to baseT, T.getBaseT()
	template <typename T>	template <typename T>
	class QhullSet : public QhullSetBase {	class QhullSet : public QhullSetBase {

	private:	private:
	#//Fields -- see QhullSetBase	#//Fields -- see QhullSetBase

	#//Class objects	#//Class objects

End of changes. 2 change blocks.
	4 lines changed or deleted	4 lines changed or added

	QhullSets.h	QhullSets.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (c) 2008-2011 C.B. Barber. All rights reserved.	** Copyright (c) 2008-2012 C.B. Barber. All rights reserved.
	** $Id: //main/2011/qhull/src/libqhullcpp/QhullSets.h#2 $$Change: 1342 $	** $Id: //main/2011/qhull/src/libqhullcpp/QhullSets.h#3 $$Change: 1464 $
	** $DateTime: 2011/03/07 21:55:47 $$Author: bbarber $	** $DateTime: 2012/01/25 22:58:41 $$Author: bbarber $
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QHULLSETS_H	#ifndef QHULLSETS_H
	#define QHULLSETS_H	#define QHULLSETS_H

	#include "QhullSet.h"	#include "QhullSet.h"

	namespace orgQhull {	namespace orgQhull {


End of changes. 1 change blocks.
	3 lines changed or deleted	3 lines changed or added

	QhullStat.h	QhullStat.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (c) 2008-2011 C.B. Barber. All rights reserved.	** Copyright (c) 2008-2012 C.B. Barber. All rights reserved.
	** $Id: //main/2011/qhull/src/libqhullcpp/QhullStat.h#5 $$Change: 1382 $	** $Id: //main/2011/qhull/src/libqhullcpp/QhullStat.h#6 $$Change: 1464 $
	** $DateTime: 2011/05/14 10:45:42 $$Author: bbarber $	** $DateTime: 2012/01/25 22:58:41 $$Author: bbarber $
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QHULLSTAT_H	#ifndef QHULLSTAT_H
	#define QHULLSTAT_H	#define QHULLSTAT_H

	extern "C" {	extern "C" {
	#include "libqhull/qhull_a.h"	#include "libqhull/qhull_a.h"
	}	}


End of changes. 1 change blocks.
	3 lines changed or deleted	3 lines changed or added

	QhullVertex.h	QhullVertex.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (c) 2008-2011 C.B. Barber. All rights reserved.	** Copyright (c) 2008-2012 C.B. Barber. All rights reserved.
	** $Id: //main/2011/qhull/src/libqhullcpp/QhullVertex.h#5 $$Change: 1382 $	** $Id: //main/2011/qhull/src/libqhullcpp/QhullVertex.h#6 $$Change: 1464 $
	** $DateTime: 2011/05/14 10:45:42 $$Author: bbarber $	** $DateTime: 2012/01/25 22:58:41 $$Author: bbarber $
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QHULLVERTEX_H	#ifndef QHULLVERTEX_H
	#define QHULLVERTEX_H	#define QHULLVERTEX_H

	#include "UsingLibQhull.h"	#include "UsingLibQhull.h"
	#include "QhullPoint.h"	#include "QhullPoint.h"
	#include "QhullLinkedList.h"	#include "QhullLinkedList.h"
	#include "QhullSet.h"	#include "QhullSet.h"

End of changes. 1 change blocks.
	3 lines changed or deleted	3 lines changed or added

	QhullVertexSet.h	QhullVertexSet.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (c) 2009-2011 C.B. Barber. All rights reserved.	** Copyright (c) 2009-2012 C.B. Barber. All rights reserved.
	** $Id: //main/2011/qhull/src/libqhullcpp/QhullVertexSet.h#4 $$Change: 1382	** $Id: //main/2011/qhull/src/libqhullcpp/QhullVertexSet.h#5 $$Change: 1464
	$	$
	** $DateTime: 2011/05/14 10:45:42 $$Author: bbarber $	** $DateTime: 2012/01/25 22:58:41 $$Author: bbarber $
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QHULLVERTEXSET_H	#ifndef QHULLVERTEXSET_H
	#define QHULLVERTEXSET_H	#define QHULLVERTEXSET_H

	#include "QhullSet.h"	#include "QhullSet.h"

	#include <ostream>	#include <ostream>


End of changes. 1 change blocks.
	4 lines changed or deleted	4 lines changed or added

	RboxPoints.h	RboxPoints.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (c) 2008-2011 C.B. Barber. All rights reserved.	** Copyright (c) 2008-2012 C.B. Barber. All rights reserved.
	** $Id: //main/2011/qhull/src/libqhullcpp/RboxPoints.h#5 $$Change: 1382 $	** $Id: //main/2011/qhull/src/libqhullcpp/RboxPoints.h#6 $$Change: 1464 $
	** $DateTime: 2011/05/14 10:45:42 $$Author: bbarber $	** $DateTime: 2012/01/25 22:58:41 $$Author: bbarber $
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef RBOXPOINTS_H	#ifndef RBOXPOINTS_H
	#define RBOXPOINTS_H	#define RBOXPOINTS_H

	#include "QhullPoint.h"	#include "QhullPoint.h"
	#include "PointCoordinates.h"	#include "PointCoordinates.h"
	extern "C" {	extern "C" {
	#include "libqhull/libqhull.h"	#include "libqhull/libqhull.h"

End of changes. 1 change blocks.
	3 lines changed or deleted	3 lines changed or added

	RoadError.h	RoadError.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (c) 2008-2011 C.B. Barber. All rights reserved.	** Copyright (c) 2008-2012 C.B. Barber. All rights reserved.
	** $Id: //main/2011/qhull/src/road/RoadError.h#4 $$Change: 1342 $	** $Id: //main/2011/qhull/src/libqhullcpp/RoadError.h#1 $$Change: 1490 $
	** $DateTime: 2011/03/07 21:55:47 $$Author: bbarber $	** $DateTime: 2012/02/19 20:27:01 $$Author: bbarber $
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef ROADERROR_H	#ifndef ROADERROR_H
	#define ROADERROR_H	#define ROADERROR_H

	#include "RoadLogEvent.h"	#include "RoadLogEvent.h"

	#include <iostream>	#include <iostream>
	#include <sstream>	#include <sstream>

End of changes. 1 change blocks.
	3 lines changed or deleted	3 lines changed or added

	RoadLogEvent.h	RoadLogEvent.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (c) 2008-2011 C.B. Barber. All rights reserved.	** Copyright (c) 2008-2012 C.B. Barber. All rights reserved.
	** $Id: //main/2011/qhull/src/road/RoadLogEvent.h#3 $$Change: 1342 $	** $Id: //main/2011/qhull/src/libqhullcpp/RoadLogEvent.h#1 $$Change: 1490 $
	** $DateTime: 2011/03/07 21:55:47 $$Author: bbarber $	** $DateTime: 2012/02/19 20:27:01 $$Author: bbarber $
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef ROADLOGEVENT_H	#ifndef ROADLOGEVENT_H
	#define ROADLOGEVENT_H	#define ROADLOGEVENT_H

	#include <ostream>	#include <ostream>
	#include <stdexcept>	#include <stdexcept>
	#include <string>	#include <string>


End of changes. 1 change blocks.
	3 lines changed or deleted	3 lines changed or added

	RoadTest.h	RoadTest.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (c) 2008-2011 C.B. Barber. All rights reserved.	** Copyright (c) 2008-2012 C.B. Barber. All rights reserved.
	** $Id: //main/2011/qhull/src/road/RoadTest.h#2 $$Change: 1342 $	** $Id: //main/2011/qhull/src/qhulltest/RoadTest.h#1 $$Change: 1490 $
	** $Date: 2011/03/07 $$Author: bbarber $	** $Date: 2012/02/19 $$Author: bbarber $
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef ROADTEST_H	#ifndef ROADTEST_H
	#define ROADTEST_H	#define ROADTEST_H

	//pre-compiled with RoadTest.h	//pre-compiled with RoadTest.h
	#include <QObject> // Qt C++ Framework	#include <QObject> // Qt C++ Framework
	#include <QtTest/QtTest>	#include <QtTest/QtTest>


End of changes. 1 change blocks.
	3 lines changed or deleted	3 lines changed or added

	UsingLibQhull.h	UsingLibQhull.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (c) 2008-2011 C.B. Barber. All rights reserved.	** Copyright (c) 2008-2012 C.B. Barber. All rights reserved.
	** $Id: //main/2011/qhull/src/libqhullcpp/UsingLibQhull.h#5 $$Change: 1382	** $Id: //main/2011/qhull/src/libqhullcpp/UsingLibQhull.h#6 $$Change: 1464
	$	$
	** $DateTime: 2011/05/14 10:45:42 $$Author: bbarber $	** $DateTime: 2012/01/25 22:58:41 $$Author: bbarber $
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef USINGlibqhull_H	#ifndef USINGlibqhull_H
	#define USINGlibqhull_H	#define USINGlibqhull_H

	#include "QhullError.h"	#include "QhullError.h"
	extern "C" {	extern "C" {
	#include "libqhull/libqhull.h"	#include "libqhull/libqhull.h"
	}	}

End of changes. 1 change blocks.
	4 lines changed or deleted	4 lines changed or added

	functionObjects.h	functionObjects.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (c) 2008-2011 C.B. Barber. All rights reserved.	** Copyright (c) 2008-2012 C.B. Barber. All rights reserved.
	** $Id: //main/2011/qhull/src/libqhullcpp/functionObjects.h#3 $$Change: 134	** $Id: //main/2011/qhull/src/libqhullcpp/functionObjects.h#4 $$Change: 146
	2 $	4 $
	** $DateTime: 2011/03/07 21:55:47 $$Author: bbarber $	** $DateTime: 2012/01/25 22:58:41 $$Author: bbarber $
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QHFUNCTIONOBJECTS_H	#ifndef QHFUNCTIONOBJECTS_H
	#define QHFUNCTIONOBJECTS_H	#define QHFUNCTIONOBJECTS_H

	#include <stdlib.h>	#include <stdlib.h>
	#include <math.h>	#include <math.h>

	namespace orgQhull {	namespace orgQhull {

End of changes. 1 change blocks.
	4 lines changed or deleted	4 lines changed or added

	geom.h	geom.h
	/*<html><pre> -<a href="qh-geom.htm"	/*<html><pre> -<a href="qh-geom.htm"
	>-------------------------------</a><a name="TOP">-</a>	>-------------------------------</a><a name="TOP">-</a>

	geom.h	geom.h
	header file for geometric routines	header file for geometric routines

	see qh-geom.htm and geom.c	see qh-geom.htm and geom.c


	Copyright (c) 1993-2011 The Geometry Center.	Copyright (c) 1993-2012 The Geometry Center.
	$Id: //main/2011/qhull/src/libqhull/geom.h#2 $$Change: 1342 $	$Id: //main/2011/qhull/src/libqhull/geom.h#3 $$Change: 1464 $
	$DateTime: 2011/03/07 21:55:47 $$Author: bbarber $	$DateTime: 2012/01/25 22:58:41 $$Author: bbarber $
	*/	*/

	#ifndef qhDEFgeom	#ifndef qhDEFgeom
	#define qhDEFgeom 1	#define qhDEFgeom 1

	#include "libqhull.h"	#include "libqhull.h"

	/* ============ -macros- ======================== */	/* ============ -macros- ======================== */

	/*-<a href="qh-geom.htm#TOC"	/*-<a href="qh-geom.htm#TOC"

End of changes. 1 change blocks.
	3 lines changed or deleted	3 lines changed or added

	io.h	io.h
	/*<html><pre> -<a href="qh-io.htm"	/*<html><pre> -<a href="qh-io.htm"
	>-------------------------------</a><a name="TOP">-</a>	>-------------------------------</a><a name="TOP">-</a>

	io.h	io.h
	declarations of Input/Output functions	declarations of Input/Output functions

	see README, libqhull.h and io.c	see README, libqhull.h and io.c


	Copyright (c) 1993-2011 The Geometry Center.	Copyright (c) 1993-2012 The Geometry Center.
	$Id: //main/2011/qhull/src/libqhull/io.h#2 $$Change: 1342 $	$Id: //main/2011/qhull/src/libqhull/io.h#3 $$Change: 1464 $
	$DateTime: 2011/03/07 21:55:47 $$Author: bbarber $	$DateTime: 2012/01/25 22:58:41 $$Author: bbarber $
	*/	*/

	#ifndef qhDEFio	#ifndef qhDEFio
	#define qhDEFio 1	#define qhDEFio 1

	#include "libqhull.h"	#include "libqhull.h"

	/============ constants and flags ==================/	/============ constants and flags ==================/

	/*-<a href="qh-io.htm#TOC"	/*-<a href="qh-io.htm#TOC"

End of changes. 1 change blocks.
	3 lines changed or deleted	3 lines changed or added

	libqhull.h	libqhull.h
	/*<html><pre> -<a href="qh-qhull.htm"	/*<html><pre> -<a href="qh-qhull.htm"
	>-------------------------------</a><a name="TOP">-</a>	>-------------------------------</a><a name="TOP">-</a>

	libqhull.h	libqhull.h
	user-level header file for using qhull.a library	user-level header file for using qhull.a library

	see qh-qhull.htm, qhull_a.h	see qh-qhull.htm, qhull_a.h


	Copyright (c) 1993-2011 The Geometry Center.	Copyright (c) 1993-2012 The Geometry Center.
	$Id: //main/2011/qhull/src/libqhull/libqhull.h#3 $$Change: 1368 $	$Id: //main/2011/qhull/src/libqhull/libqhull.h#7 $$Change: 1464 $
	$DateTime: 2011/04/16 08:12:32 $$Author: bbarber $	$DateTime: 2012/01/25 22:58:41 $$Author: bbarber $

	NOTE: access to qh_qh is via the 'qh' macro. This allows	NOTE: access to qh_qh is via the 'qh' macro. This allows
	qh_qh to be either a pointer or a structure. An example	qh_qh to be either a pointer or a structure. An example
	of using qh is "qh DROPdim" which accesses the DROPdim	of using qh is "qh DROPdim" which accesses the DROPdim
	field of qh_qh. Similarly, access to qh_qhstat is via	field of qh_qh. Similarly, access to qh_qhstat is via
	the 'qhstat' macro.	the 'qhstat' macro.

	includes function prototypes for libqhull.c, geom.c, global.c, io.c, use r.c	includes function prototypes for libqhull.c, geom.c, global.c, io.c, use r.c

	use mem.h for mem.c	use mem.h for mem.c

	skipping to change at line 100	skipping to change at line 100
	#define flagT unsigned int	#define flagT unsigned int

	/*-<a href="qh-qhull.htm#TOC"	/*-<a href="qh-qhull.htm#TOC"
	>--------------------------------</a><a name="boolT">-</a>	>--------------------------------</a><a name="boolT">-</a>

	boolT	boolT
	boolean value, either True or False	boolean value, either True or False

	notes:	notes:
	needed for portability	needed for portability

		Use qh_False/qh_True as synonyms
	*/	*/
	#define boolT unsigned int	#define boolT unsigned int
	#ifdef False	#ifdef False
	#undef False	#undef False
	#endif	#endif
	#ifdef True	#ifdef True
	#undef True	#undef True
	#endif	#endif
	#define False 0	#define False 0
	#define True 1	#define True 1

		#define qh_False 0
		#define qh_True 1

	/*-<a href="qh-qhull.htm#TOC"	/*-<a href="qh-qhull.htm#TOC"
	>--------------------------------</a><a name="CENTERtype">-</a>	>--------------------------------</a><a name="CENTERtype">-</a>

	qh_CENTER	qh_CENTER
	to distinguish facet->center	to distinguish facet->center
	*/	*/
	typedef enum	typedef enum
	{	{
	qh_ASnone = 0, qh_ASvoronoi, qh_AScentrum	qh_ASnone = 0, qh_ASvoronoi, qh_AScentrum

	skipping to change at line 270	skipping to change at line 273
	facetT triowner; / owner facet for ->tricoplanar, !isarea facets w/ ->keepcentrum */	facetT triowner; / owner facet for ->tricoplanar, !isarea facets w/ ->keepcentrum */
	}f;	}f;
	coordT center; / centrum for convexity, qh CENTERtype == qh_ASce ntrum */	coordT center; / centrum for convexity, qh CENTERtype == qh_ASce ntrum */
	/* Voronoi center, qh CENTERtype == qh_ASvoronoi * /	/* Voronoi center, qh CENTERtype == qh_ASvoronoi * /
	/* if tricoplanar, shared with a neighbor */	/* if tricoplanar, shared with a neighbor */
	facetT previous; / previous facet in the facet_list */	facetT previous; / previous facet in the facet_list */
	facetT next; / next facet in the facet_list */	facetT next; / next facet in the facet_list */
	setT vertices; / vertices for this facet, inverse sorted by ID	setT vertices; / vertices for this facet, inverse sorted by ID
	if simplicial, 1st vertex was apex/furthest */	if simplicial, 1st vertex was apex/furthest */
	setT ridges; / explicit ridges for nonsimplicial facets.	setT ridges; / explicit ridges for nonsimplicial facets.

	for simplicial facets, neighbors defines ridge * /	for simplicial facets, neighbors define the ridg es */
	setT neighbors; / neighbors of the facet. If simplicial, the kth	setT neighbors; / neighbors of the facet. If simplicial, the kth
	neighbor is opposite the kth vertex, and the fir st	neighbor is opposite the kth vertex, and the fir st
	neighbor is the horizon facet for the first vert ex*/	neighbor is the horizon facet for the first vert ex*/
	setT outsideset; / set of points outside this facet	setT outsideset; / set of points outside this facet
	if non-empty, last point is furthest	if non-empty, last point is furthest
	if NARROWhull, includes coplanars for partitioni ng*/	if NARROWhull, includes coplanars for partitioni ng*/
	setT coplanarset; / set of points coplanar with this facet	setT coplanarset; / set of points coplanar with this facet
	> qh.min_vertex and <= facet->max_outside	> qh.min_vertex and <= facet->max_outside
	a point is assigned to the furthest facet	a point is assigned to the furthest facet
	if non-empty, last point is furthest away */	if non-empty, last point is furthest away */

	skipping to change at line 416	skipping to change at line 419

	extern int qhull_inuse;	extern int qhull_inuse;

	typedef struct qhT qhT;	typedef struct qhT qhT;
	#if qh_QHpointer_dllimport	#if qh_QHpointer_dllimport
	#define qh qh_qh->	#define qh qh_qh->
	__declspec(dllimport) extern qhT qh_qh; / allocated in global.c */	__declspec(dllimport) extern qhT qh_qh; / allocated in global.c */
	#elif qh_QHpointer	#elif qh_QHpointer
	#define qh qh_qh->	#define qh qh_qh->
	extern qhT qh_qh; / allocated in global.c */	extern qhT qh_qh; / allocated in global.c */

		#elif qh_dllimport
		#define qh qh_qh.
		__declspec(dllimport) extern qhT qh_qh; /* allocated in global.c */
	#else	#else
	#define qh qh_qh.	#define qh qh_qh.
	extern qhT qh_qh;	extern qhT qh_qh;
	#endif	#endif

	struct qhT {	struct qhT {

	/*-<a href="qh-globa.htm#TOC"	/*-<a href="qh-globa.htm#TOC"
	>--------------------------------</a><a name="qh-const">-</a>	>--------------------------------</a><a name="qh-const">-</a>


	skipping to change at line 1007	skipping to change at line 1013
	void qh_printhelp_degenerate(FILE *fp);	void qh_printhelp_degenerate(FILE *fp);
	void qh_printhelp_narrowhull(FILE *fp, realT minangle);	void qh_printhelp_narrowhull(FILE *fp, realT minangle);
	void qh_printhelp_singular(FILE *fp);	void qh_printhelp_singular(FILE *fp);
	void qh_user_memsizes(void);	void qh_user_memsizes(void);

	/******* -usermem.c prototypes (alphabetical) ********************/	/******* -usermem.c prototypes (alphabetical) ********************/
	void qh_exit(int exitcode);	void qh_exit(int exitcode);
	void qh_free(void *mem);	void qh_free(void *mem);
	void *qh_malloc(size_t size);	void *qh_malloc(size_t size);


	/******* -userprintf.c prototypes (alphabetical) ********************/	/******* -userprintf.c and userprintf_rbox.c prototypes ************* ***/
	void qh_fprintf(FILE fp, int msgcode, const char fmt, ... );	void qh_fprintf(FILE fp, int msgcode, const char fmt, ... );
	void qh_fprintf_rbox(FILE fp, int msgcode, const char fmt, ... );	void qh_fprintf_rbox(FILE fp, int msgcode, const char fmt, ... );

	/*** -geom.c/geom2.c/random.c prototypes (duplicated from geom.h, random. h) **************/	/*** -geom.c/geom2.c/random.c prototypes (duplicated from geom.h, random. h) **************/

	facetT qh_findbest(pointT point, facetT *startfacet,	facetT qh_findbest(pointT point, facetT *startfacet,
	boolT bestoutside, boolT newfacets, boolT noupper,	boolT bestoutside, boolT newfacets, boolT noupper,
	realT dist, boolT isoutside, int *numpart);	realT dist, boolT isoutside, int *numpart);
	facetT qh_findbestnew(pointT point, facetT *startfacet,	facetT qh_findbestnew(pointT point, facetT *startfacet,
	realT dist, boolT bestoutside, boolT isoutside, int *numpart);	realT dist, boolT bestoutside, boolT isoutside, int *numpart);

End of changes. 6 change blocks.
	5 lines changed or deleted	11 lines changed or added

	mem.h	mem.h

	skipping to change at line 14	skipping to change at line 14
	mem.h	mem.h
	prototypes for memory management functions	prototypes for memory management functions

	see qh-mem.htm, mem.c and qset.h	see qh-mem.htm, mem.c and qset.h

	for error handling, writes message and calls	for error handling, writes message and calls
	qh_errexit(qhmem_ERRmem, NULL, NULL) if insufficient memory	qh_errexit(qhmem_ERRmem, NULL, NULL) if insufficient memory
	and	and
	qh_errexit(qhmem_ERRqhull, NULL, NULL) otherwise	qh_errexit(qhmem_ERRqhull, NULL, NULL) otherwise


	Copyright (c) 1993-2011 The Geometry Center.	Copyright (c) 1993-2012 The Geometry Center.
	$Id: //main/2011/qhull/src/libqhull/mem.h#3 $$Change: 1356 $	$Id: //main/2011/qhull/src/libqhull/mem.h#4 $$Change: 1464 $
	$DateTime: 2011/04/03 09:01:22 $$Author: bbarber $	$DateTime: 2012/01/25 22:58:41 $$Author: bbarber $
	*/	*/

	#ifndef qhDEFmem	#ifndef qhDEFmem
	#define qhDEFmem 1	#define qhDEFmem 1

	#include <stdio.h>	#include <stdio.h>

	/*-<a href="qh-mem.htm#TOC"	/*-<a href="qh-mem.htm#TOC"
	>-------------------------------</a><a name="NOmem">-</a>	>-------------------------------</a><a name="NOmem">-</a>


End of changes. 1 change blocks.
	3 lines changed or deleted	3 lines changed or added

	merge.h	merge.h
	/*<html><pre> -<a href="qh-merge.htm"	/*<html><pre> -<a href="qh-merge.htm"
	>-------------------------------</a><a name="TOP">-</a>	>-------------------------------</a><a name="TOP">-</a>

	merge.h	merge.h
	header file for merge.c	header file for merge.c

	see qh-merge.htm and merge.c	see qh-merge.htm and merge.c


	Copyright (c) 1993-2011 C.B. Barber.	Copyright (c) 1993-2012 C.B. Barber.
	$Id: //main/2011/qhull/src/libqhull/merge.h#2 $$Change: 1342 $	$Id: //main/2011/qhull/src/libqhull/merge.h#3 $$Change: 1464 $
	$DateTime: 2011/03/07 21:55:47 $$Author: bbarber $	$DateTime: 2012/01/25 22:58:41 $$Author: bbarber $
	*/	*/

	#ifndef qhDEFmerge	#ifndef qhDEFmerge
	#define qhDEFmerge 1	#define qhDEFmerge 1

	#include "libqhull.h"	#include "libqhull.h"

	/============ -constants- ==============/	/============ -constants- ==============/

	/*-<a href="qh-merge.htm#TOC"	/*-<a href="qh-merge.htm#TOC"

End of changes. 1 change blocks.
	3 lines changed or deleted	3 lines changed or added

	poly.h	poly.h
	/*<html><pre> -<a href="qh-poly.htm"	/*<html><pre> -<a href="qh-poly.htm"
	>-------------------------------</a><a name="TOP">-</a>	>-------------------------------</a><a name="TOP">-</a>

	poly.h	poly.h
	header file for poly.c and poly2.c	header file for poly.c and poly2.c

	see qh-poly.htm, libqhull.h and poly.c	see qh-poly.htm, libqhull.h and poly.c


	Copyright (c) 1993-2011 The Geometry Center.	Copyright (c) 1993-2012 The Geometry Center.
	$Id: //main/2011/qhull/src/libqhull/poly.h#2 $$Change: 1342 $	$Id: //main/2011/qhull/src/libqhull/poly.h#3 $$Change: 1464 $
	$DateTime: 2011/03/07 21:55:47 $$Author: bbarber $	$DateTime: 2012/01/25 22:58:41 $$Author: bbarber $
	*/	*/

	#ifndef qhDEFpoly	#ifndef qhDEFpoly
	#define qhDEFpoly 1	#define qhDEFpoly 1

	#include "libqhull.h"	#include "libqhull.h"

	/=============== constants ========================== /	/=============== constants ========================== /

	/*-<a href="qh-geom.htm#TOC"	/*-<a href="qh-geom.htm#TOC"

End of changes. 1 change blocks.
	3 lines changed or deleted	3 lines changed or added

	qhull_a.h	qhull_a.h

	skipping to change at line 15	skipping to change at line 15
	all header files for compiling qhull	all header files for compiling qhull

	see qh-qhull.htm	see qh-qhull.htm

	see libqhull.h for user-level definitions	see libqhull.h for user-level definitions

	see user.h for user-defineable constants	see user.h for user-defineable constants

	defines internal functions for libqhull.c global.c	defines internal functions for libqhull.c global.c


	Copyright (c) 1993-2011 The Geometry Center.	Copyright (c) 1993-2012 The Geometry Center.
	$Id: //main/2011/qhull/src/libqhull/qhull_a.h#2 $$Change: 1342 $	$Id: //main/2011/qhull/src/libqhull/qhull_a.h#3 $$Change: 1464 $
	$DateTime: 2011/03/07 21:55:47 $$Author: bbarber $	$DateTime: 2012/01/25 22:58:41 $$Author: bbarber $

	Notes: grep for ((" and (" to catch fprintf("lkasdjf");	Notes: grep for ((" and (" to catch fprintf("lkasdjf");
	full parens around (x?y:z)	full parens around (x?y:z)
	use '#include qhull/qhull_a.h' to avoid name clashes	use '#include qhull/qhull_a.h' to avoid name clashes
	*/	*/

	#ifndef qhDEFqhulla	#ifndef qhDEFqhulla
	#define qhDEFqhulla 1	#define qhDEFqhulla 1

	#include "libqhull.h" /* Defines data types */	#include "libqhull.h" /* Defines data types */

End of changes. 1 change blocks.
	3 lines changed or deleted	3 lines changed or added

	qset.h	qset.h

	skipping to change at line 19	skipping to change at line 19
	only uses mem.c, malloc/free	only uses mem.c, malloc/free

	for error handling, writes message and calls	for error handling, writes message and calls
	qh_errexit(qhmem_ERRqhull, NULL, NULL);	qh_errexit(qhmem_ERRqhull, NULL, NULL);

	set operations satisfy the following properties:	set operations satisfy the following properties:
	- sets have a max size, the actual size (if different) is stored at the end	- sets have a max size, the actual size (if different) is stored at the end
	- every set is NULL terminated	- every set is NULL terminated
	- sets may be sorted or unsorted, the caller must distinguish this	- sets may be sorted or unsorted, the caller must distinguish this


	Copyright (c) 1993-2011 The Geometry Center.	Copyright (c) 1993-2012 The Geometry Center.
	$Id: //main/2011/qhull/src/libqhull/qset.h#2 $$Change: 1342 $	$Id: //main/2011/qhull/src/libqhull/qset.h#4 $$Change: 1464 $
	$DateTime: 2011/03/07 21:55:47 $$Author: bbarber $	$DateTime: 2012/01/25 22:58:41 $$Author: bbarber $
	*/	*/

	#ifndef qhDEFset	#ifndef qhDEFset
	#define qhDEFset 1	#define qhDEFset 1

	#include <stdio.h>	#include <stdio.h>

	/================= -structures- ===============/	/================= -structures- ===============/

	#ifndef DEFsetT	#ifndef DEFsetT

	skipping to change at line 423	skipping to change at line 423
	notes:	notes:
	set may be NULL	set may be NULL
	*/	*/
	#define SETempty_(set) (!set \|\| (SETfirst_(set) ? 0 : 1))	#define SETempty_(set) (!set \|\| (SETfirst_(set) ? 0 : 1))

	/*-<a href="qh-set.htm#TOC"	/*-<a href="qh-set.htm#TOC"
	>-------------------------------<a name="SETsizeaddr_">-</a>	>-------------------------------<a name="SETsizeaddr_">-</a>

	SETsizeaddr_(set)	SETsizeaddr_(set)
	return pointer to 'actual size+1' of set (set CANNOT be NULL!!)	return pointer to 'actual size+1' of set (set CANNOT be NULL!!)

		Its type is setelemT* for strict aliasing
		All SETelemaddr_ must be cast to setelemT

	notes:	notes:
	SETsizeaddr==NULL or e[SETsizeaddr-1].p==NULL	SETsizeaddr==NULL or e[SETsizeaddr-1].p==NULL
	*/	*/

	#define SETsizeaddr_(set) (&((set)->e[(set)->maxsize].i))	#define SETsizeaddr_(set) (&((set)->e[(set)->maxsize]))

	/*-<a href="qh-set.htm#TOC"	/*-<a href="qh-set.htm#TOC"
	>---------------------------------------</a><a name="SETtruncate_">-</a>	>---------------------------------------</a><a name="SETtruncate_">-</a>


	SETtruncate_(set)	SETtruncate_(set, size)
	return first element of set	truncate set to size

	see:	see:
	qh_settruncate()	qh_settruncate()

	*/	*/
	#define SETtruncate_(set, size) {set->e[set->maxsize].i= size+1; /* maybe o verwritten */ \	#define SETtruncate_(set, size) {set->e[set->maxsize].i= size+1; /* maybe o verwritten */ \
	set->e[size].p= NULL;}	set->e[size].p= NULL;}

	/======= prototypes in alphabetical order ============/	/======= prototypes in alphabetical order ============/


	skipping to change at line 461	skipping to change at line 463
	setT qh_setcopy(setT set, int extra);	setT qh_setcopy(setT set, int extra);
	void qh_setdel(setT set, void *elem);	void qh_setdel(setT set, void *elem);
	void qh_setdellast(setT set);	void qh_setdellast(setT set);
	void qh_setdelnth(setT set, int nth);	void qh_setdelnth(setT set, int nth);
	void qh_setdelnthsorted(setT set, int nth);	void qh_setdelnthsorted(setT set, int nth);
	void qh_setdelsorted(setT set, void *newelem);	void qh_setdelsorted(setT set, void *newelem);
	setT qh_setduplicate( setT set, int elemsize);	setT qh_setduplicate( setT set, int elemsize);
	int qh_setequal(setT setA, setT setB);	int qh_setequal(setT setA, setT setB);
	int qh_setequal_except(setT setA, void skipelemA, setT setB, void ski pelemB);	int qh_setequal_except(setT setA, void skipelemA, setT setB, void ski pelemB);
	int qh_setequal_skip(setT setA, int skipA, setT setB, int skipB);	int qh_setequal_skip(setT setA, int skipA, setT setB, int skipB);

		void *qh_setendpointer(setT set);
	void qh_setfree(setT **set);	void qh_setfree(setT **set);
	void qh_setfree2( setT **setp, int elemsize);	void qh_setfree2( setT **setp, int elemsize);
	void qh_setfreelong(setT **set);	void qh_setfreelong(setT **set);
	int qh_setin(setT set, void setelem);	int qh_setin(setT set, void setelem);
	int qh_setindex(setT set, void setelem);	int qh_setindex(setT set, void setelem);
	void qh_setlarger(setT **setp);	void qh_setlarger(setT **setp);
	void qh_setlast(setT set);	void qh_setlast(setT set);
	setT *qh_setnew(int size);	setT *qh_setnew(int size);
	setT qh_setnew_delnthsorted(setT set, int size, int nth, int prepend);	setT qh_setnew_delnthsorted(setT set, int size, int nth, int prepend);
	void qh_setprint(FILE fp, const char string, setT *set);	void qh_setprint(FILE fp, const char string, setT *set);

End of changes. 5 change blocks.
	6 lines changed or deleted	9 lines changed or added

	random.h	random.h
	/*<html><pre> -<a href="qh-geom.htm"	/*<html><pre> -<a href="qh-geom.htm"
	>-------------------------------</a><a name="TOP">-</a>	>-------------------------------</a><a name="TOP">-</a>

	random.h	random.h
	header file for random routines	header file for random routines

	see qh-geom.htm and random.c	see qh-geom.htm and random.c


	Copyright (c) 1993-2011 The Geometry Center.	Copyright (c) 1993-2012 The Geometry Center.
	$Id: //main/2011/qhull/src/libqhull/random.h#2 $$Change: 1342 $	$Id: //main/2011/qhull/src/libqhull/random.h#3 $$Change: 1464 $
	$DateTime: 2011/03/07 21:55:47 $$Author: bbarber $	$DateTime: 2012/01/25 22:58:41 $$Author: bbarber $
	*/	*/

	#ifndef qhDEFrandom	#ifndef qhDEFrandom
	#define qhDEFrandom 1	#define qhDEFrandom 1

	#include "libqhull.h"	#include "libqhull.h"

	/============= prototypes in alphabetical order ======= /	/============= prototypes in alphabetical order ======= /

	int qh_argv_to_command(int argc, char argv[], char command, int max_s ize);	int qh_argv_to_command(int argc, char argv[], char command, int max_s ize);

End of changes. 1 change blocks.
	3 lines changed or deleted	3 lines changed or added

	stat.h	stat.h
	/*<html><pre> -<a href="qh-stat.htm"	/*<html><pre> -<a href="qh-stat.htm"
	>-------------------------------</a><a name="TOP">-</a>	>-------------------------------</a><a name="TOP">-</a>

	stat.h	stat.h
	contains all statistics that are collected for qhull	contains all statistics that are collected for qhull

	see qh-stat.htm and stat.c	see qh-stat.htm and stat.c


	Copyright (c) 1993-2011 The Geometry Center.	Copyright (c) 1993-2012 The Geometry Center.
	$Id: //main/2011/qhull/src/libqhull/stat.h#3 $$Change: 1368 $	$Id: //main/2011/qhull/src/libqhull/stat.h#5 $$Change: 1464 $
	$DateTime: 2011/04/16 08:12:32 $$Author: bbarber $	$DateTime: 2012/01/25 22:58:41 $$Author: bbarber $

	recompile qhull if you change this file	recompile qhull if you change this file

	Integer statistics are Z* while real statistics are W*.	Integer statistics are Z* while real statistics are W*.

	define maydebugx to call a routine at every statistic event	define maydebugx to call a routine at every statistic event

	*/	*/

	#ifndef qhDEFstat	#ifndef qhDEFstat

	skipping to change at line 478	skipping to change at line 478
	global data structure for statistics, similar to qh and qhrbox	global data structure for statistics, similar to qh and qhrbox

	notes:	notes:
	access to qh_qhstat is via the "qhstat" macro. There are two choices	access to qh_qhstat is via the "qhstat" macro. There are two choices
	qh_QHpointer = 1 access globals via a pointer	qh_QHpointer = 1 access globals via a pointer
	enables qh_saveqhull() and qh_restoreqhull()	enables qh_saveqhull() and qh_restoreqhull()
	= 0 qh_qhstat is a static data structure	= 0 qh_qhstat is a static data structure
	only one instance of qhull() can be active at a tim e	only one instance of qhull() can be active at a tim e
	default value	default value
	qh_QHpointer is defined in libqhull.h	qh_QHpointer is defined in libqhull.h

		qh_QHpointer_dllimport and qh_dllimport define qh_qh as __declspec(dllim port) [libqhull.h]

	allocated in stat.c using qh_malloc()	allocated in stat.c using qh_malloc()
	*/	*/
	#ifndef DEFqhstatT	#ifndef DEFqhstatT
	#define DEFqhstatT 1	#define DEFqhstatT 1
	typedef struct qhstatT qhstatT;	typedef struct qhstatT qhstatT;
	#endif	#endif

	#if qh_QHpointer_dllimport	#if qh_QHpointer_dllimport
	#define qhstat qh_qhstat->	#define qhstat qh_qhstat->
	__declspec(dllimport) extern qhstatT *qh_qhstat;	__declspec(dllimport) extern qhstatT *qh_qhstat;
	#elif qh_QHpointer	#elif qh_QHpointer
	#define qhstat qh_qhstat->	#define qhstat qh_qhstat->
	extern qhstatT *qh_qhstat;	extern qhstatT *qh_qhstat;

		#elif qh_dllimport
		#define qhstat qh_qhstat.
		__declspec(dllimport) extern qhstatT qh_qhstat;
	#else	#else
	#define qhstat qh_qhstat.	#define qhstat qh_qhstat.
	extern qhstatT qh_qhstat;	extern qhstatT qh_qhstat;
	#endif	#endif
	struct qhstatT {	struct qhstatT {
	intrealT stats[ZEND]; /* integer and real statistics */	intrealT stats[ZEND]; /* integer and real statistics */
	unsigned char id[ZEND+10]; /* id's in print order */	unsigned char id[ZEND+10]; /* id's in print order */
	const char doc[ZEND]; / array of documentation strings */	const char doc[ZEND]; / array of documentation strings */
	short int count[ZEND]; /* -1 if none, else index of count to use */	short int count[ZEND]; /* -1 if none, else index of count to use */
	char type[ZEND]; /* type, see ztypes above */	char type[ZEND]; /* type, see ztypes above */

End of changes. 3 change blocks.
	3 lines changed or deleted	7 lines changed or added

	user.h	user.h

	skipping to change at line 53	skipping to change at line 53
	#define qh_FILENAMElen 500	#define qh_FILENAMElen 500

	/*-<a href="qh-user.htm#TOC"	/*-<a href="qh-user.htm#TOC"
	>--------------------------------</a><a name="msgcode">-</a>	>--------------------------------</a><a name="msgcode">-</a>

	msgcode -- Unique message codes for qh_fprintf	msgcode -- Unique message codes for qh_fprintf

	If add new messages, assign these values and increment.	If add new messages, assign these values and increment.

	def counters = [27, 1047, 2059, 3025, 4068, 5003,	def counters = [27, 1047, 2059, 3025, 4068, 5003,

	6235, 7079, 8143, 9410, 10000, 11026]	6241, 7079, 8143, 9410, 10000, 11026]

	See: qh_ERR* [libqhull.h]	See: qh_ERR* [libqhull.h]
	*/	*/

	#define MSG_TRACE0 0	#define MSG_TRACE0 0
	#define MSG_TRACE1 1000	#define MSG_TRACE1 1000
	#define MSG_TRACE2 2000	#define MSG_TRACE2 2000
	#define MSG_TRACE3 3000	#define MSG_TRACE3 3000
	#define MSG_TRACE4 4000	#define MSG_TRACE4 4000
	#define MSG_TRACE5 5000	#define MSG_TRACE5 5000

	skipping to change at line 582	skipping to change at line 582

	qh_QHpointer = 1 access globals via a pointer to allocated memory	qh_QHpointer = 1 access globals via a pointer to allocated memory
	enables qh_saveqhull() and qh_restoreqhull()	enables qh_saveqhull() and qh_restoreqhull()
	[2010, gcc] costs about 4% in time and 4% in space	[2010, gcc] costs about 4% in time and 4% in space
	[2003, msvc] costs about 8% in time and 2% in space	[2003, msvc] costs about 8% in time and 2% in space

	= 0 qh_qh and qh_qhstat are static data structures	= 0 qh_qh and qh_qhstat are static data structures
	only one instance of qhull() can be active at a tim e	only one instance of qhull() can be active at a tim e
	default value	default value


	qh_QHpointer_dllimport defines qh_qh as a __declspec(dllimport) [libqhull .h]	qh_QHpointer_dllimport and qh_dllimport define qh_qh as __declspec(dllimp ort) [libqhull.h]
	It is required for msvc-2005. It is not needed for gcc.	It is required for msvc-2005. It is not needed for gcc.

	notes:	notes:
	all global variables for qhull are in qh, qhmem, and qhstat	all global variables for qhull are in qh, qhmem, and qhstat
	qh is defined in libqhull.h	qh is defined in libqhull.h
	qhmem is defined in mem.h	qhmem is defined in mem.h
	qhstat is defined in stat.h	qhstat is defined in stat.h
	C++ build defines qh_QHpointer [libqhullp.pro, libqhullcpp.pro]	C++ build defines qh_QHpointer [libqhullp.pro, libqhullcpp.pro]

	see:	see:
	user_eg.c for an example	user_eg.c for an example
	*/	*/

	#ifndef qh_QHpointer	#ifdef qh_QHpointer
		#if qh_dllimport
		#error QH6207 Qhull error: Use qh_QHpointer_dllimport instead of qh_dllimpo
		rt with qh_QHpointer
		#endif
		#else
	#define qh_QHpointer 0	#define qh_QHpointer 0
	#if qh_QHpointer_dllimport	#if qh_QHpointer_dllimport

	#error QH6234 Qhull error: qh_QHpointer must be defined when using qh_QHpoi nter_dllimport.	#error QH6234 Qhull error: Use qh_dllimport instead of qh_QHpointer_dllimpo rt when qh_QHpointer is not defined
	#endif	#endif
	#endif	#endif
	#if 0 /* sample code */	#if 0 /* sample code */
	qhT oldqhA, oldqhB;	qhT oldqhA, oldqhB;

	exitcode= qh_new_qhull(dim, numpoints, points, ismalloc,	exitcode= qh_new_qhull(dim, numpoints, points, ismalloc,
	flags, outfile, errfile);	flags, outfile, errfile);
	/* use results from first call to qh_new_qhull */	/* use results from first call to qh_new_qhull */
	oldqhA= qh_save_qhull();	oldqhA= qh_save_qhull();
	exitcode= qh_new_qhull(dimB, numpointsB, pointsB, ismalloc,	exitcode= qh_new_qhull(dimB, numpointsB, pointsB, ismalloc,

End of changes. 4 change blocks.
	4 lines changed or deleted	9 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/