Merge kicad-pns-mac (5e3030ee) · Commits · Elphel / kicad-source-mirror

common/CMakeLists.txt

+10 −8

Original line number	Original line	Diff line number	Diff line
	@@ -156,6 +156,7 @@ set(COMMON_SRCS
	view/view_item.cpp		view/view_item.cpp
	view/view_group.cpp		view/view_group.cpp

			math/math_util.cpp
	system/fcontext.s		system/fcontext.s

	tool/tool_base.cpp		tool/tool_base.cpp
	@@ -169,6 +170,7 @@ set(COMMON_SRCS
	geometry/seg.cpp		geometry/seg.cpp
	geometry/shape_line_chain.cpp		geometry/shape_line_chain.cpp
	geometry/shape_collisions.cpp		geometry/shape_collisions.cpp
			geometry/shape_index.cpp
	)		)

	add_library(common STATIC ${COMMON_SRCS})		add_library(common STATIC ${COMMON_SRCS})

common/geometry/shape_collisions.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,7 @@
	#include <geometry/shape_circle.h>		#include <geometry/shape_circle.h>
	#include <geometry/shape_rect.h>		#include <geometry/shape_rect.h>

	typedef typename VECTOR2I::extended_type ecoord;		typedef VECTOR2I::extended_type ecoord;

	static inline bool Collide( const SHAPE_CIRCLE& a, const SHAPE_CIRCLE& b, int clearance, bool needMTV, VECTOR2I& aMTV )		static inline bool Collide( const SHAPE_CIRCLE& a, const SHAPE_CIRCLE& b, int clearance, bool needMTV, VECTOR2I& aMTV )
	{		{

common/geometry/shape_index.cpp

0 → 100644

+33 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* This program source code file is part of KiCad, a free EDA CAD application.
			*
			* Copyright (C) 2013 CERN
			* @author Jacobo Aragunde Pérez
			* @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
			*
			* This program 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.
			*
			* This program 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 this program; if not, you may find one here:
			* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
			* or you may search the http://www.gnu.org website for the version 2 license,
			* or you may write to the Free Software Foundation, Inc.,
			* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
			*/

			#include <geometry/shape_index.h>

			template<>
			const SHAPE* shapeFunctor( SHAPE* aItem )
			{
			return aItem;
			}

common/math/math_util.cpp

0 → 100644

+80 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* This program source code file is part of KICAD, a free EDA CAD application.
			*
			* Copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
			* Copyright (C) CERN
			* @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
			*
			* This program 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.
			*
			* This program 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 this program; if not, you may find one here:
			* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
			* or you may search the http://www.gnu.org website for the version 2 license,
			* or you may write to the Free Software Foundation, Inc.,
			* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
			*/

			#include <math/math_util.h>

			// explicit specializations for integer types, taking care of overflow.
			template<> int rescale( int numerator, int value, int denominator )
			{
			return (int) ( (int64_t) numerator * (int64_t) value / (int64_t) denominator );
			}

			template<> int64_t rescale( int64_t numerator, int64_t value, int64_t denominator )
			{
			uint64_t r = 0;
			int64_t sign = ( ( numerator < 0) ? -1 : 1 ) * ( denominator < 0 ? - 1: 1 ) * (value < 0 ? - 1 : 1);

			uint64_t a = abs( numerator );
			uint64_t b = abs( value );
			uint64_t c = abs( denominator );

			r = c / 2;

			if( b <= INT_MAX && c <= INT_MAX )
			{
			if( a <= INT_MAX )
			return sign * ( (a * b + r ) / c );
			else
			return sign * (a / c * b + (a % c * b + r) / c);
			} else {
			uint64_t a0 = a & 0xFFFFFFFF;
			uint64_t a1 = a >> 32;
			uint64_t b0 = b & 0xFFFFFFFF;
			uint64_t b1 = b >> 32;
			uint64_t t1 = a0 * b1 + a1 * b0;
			uint64_t t1a = t1 << 32;
			int i;

			a0 = a0 * b0 + t1a;
			a1 = a1 * b1 + (t1 >> 32) + (a0 < t1a);
			a0 += r;
			a1 += a0 < r;

			for( i = 63; i >= 0; i-- )
			{
			a1 += a1 + ( (a0 >> i) & 1 );
			t1 += t1;

			if( c <= a1 )
			{
			a1 -= c;
			t1++;
			}
			}

			return t1 * sign;
			}
			};

common/system/fcontext.s

+29 −10

Original line number	Original line	Diff line number	Diff line
	@@ -3,6 +3,21 @@
	which may be unpleasant, in particular under Windows (we don't support VC++, while boost::context		which may be unpleasant, in particular under Windows (we don't support VC++, while boost::context
	does not support mingw */		does not support mingw */

			#ifdef __APPLE__

			#if __i386__
			#include "jump_i386_sysv_macho_gas.S"
			#include "make_i386_sysv_macho_gas.S"

			#elif __x86_64__
			#include "jump_x86_64_sysv_macho_gas.S"
			#include "make_x86_64_sysv_macho_gas.S"

			#else
			#error "Missing make_fcontext & jump_fcontext routines for this architecture"
			#endif

			#else

	#if __i386__		#if __i386__

	@@ -17,5 +32,9 @@
	#elif __x86_64__		#elif __x86_64__
	#include "jump_x86_64_sysv_elf_gas.S"		#include "jump_x86_64_sysv_elf_gas.S"
	#include "make_x86_64_sysv_elf_gas.S"		#include "make_x86_64_sysv_elf_gas.S"

			#else
			#error "Missing make_fcontext & jump_fcontext routines for this architecture"
	#endif		#endif

			#endif

Admin message