Revision: 56608
http://sourceforge.net/p/brlcad/code/56608
Author: starseeker
Date: 2013-08-05 22:24:01 +0000 (Mon, 05 Aug 2013)
Log Message:
-----------
Closer - buildings with MSVC, but the obb operation crashes with an error
having to do with a sort call using a CompareByAngles comparison - Expression:
invalid operator<
Modified Paths:
--------------
brlcad/trunk/src/other/libgdiam/CMakeLists.txt
brlcad/trunk/src/other/libgdiam/gdiam.cpp
brlcad/trunk/src/other/libgdiam/gdiam.hpp
Modified: brlcad/trunk/src/other/libgdiam/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/libgdiam/CMakeLists.txt 2013-08-05 22:13:24 UTC
(rev 56607)
+++ brlcad/trunk/src/other/libgdiam/CMakeLists.txt 2013-08-05 22:24:01 UTC
(rev 56608)
@@ -25,7 +25,7 @@
ARCHIVE DESTINATION ${LIB_DIR})
if(MSVC)
- set_property(TARGET libgdiam APPEND PROPERTY COMPILE_DEFINITIONS
"VDS_DLL_EXPORTS")
+ set_property(TARGET libgdiam APPEND PROPERTY COMPILE_DEFINITIONS
"GDIAM_DLL_EXPORTS")
endif(MSVC)
if(BUILD_STATIC_LIBS)
Modified: brlcad/trunk/src/other/libgdiam/gdiam.cpp
===================================================================
--- brlcad/trunk/src/other/libgdiam/gdiam.cpp 2013-08-05 22:13:24 UTC (rev
56607)
+++ brlcad/trunk/src/other/libgdiam/gdiam.cpp 2013-08-05 22:24:01 UTC (rev
56608)
@@ -1439,26 +1439,11 @@
return false;
}
- //printf( "before: %p %p...\n", a, b );
- //fflush( stdout );
- /*
- if ( a->equal( base ) )
- return true;
- if ( b->equal( base ) )
- return false;
- */
- //printf( "a: (%g, %g)\n", a->x, a->y );
- //printf( "b: (%g, %g)\n", b->x, b->y );
- //fflush( stdout );
-
sgn = AreaSign( base, *a, *b );
if ( sgn != 0 )
return (sgn > 0);
len1 = base.dist( *a );
len2 = base.dist( *b );
-
- //printf( "bogi!\n" );
- //fflush( stdout );
return (len1 > len2);
}
@@ -2452,7 +2437,7 @@
// we want the grid to be on the two minor dimensions.
bb.set_third_dim_longest();
- grid_size = (int)sqrt( sample_size / 2 );
+ grid_size = (int)sqrt((double)(sample_size / 2) );
grid_entries = grid_size * grid_size;
mem_size = (int)( sizeof( gdiam_point ) * grid_size * grid_size );
Modified: brlcad/trunk/src/other/libgdiam/gdiam.hpp
===================================================================
--- brlcad/trunk/src/other/libgdiam/gdiam.hpp 2013-08-05 22:13:24 UTC (rev
56607)
+++ brlcad/trunk/src/other/libgdiam/gdiam.hpp 2013-08-05 22:24:01 UTC (rev
56608)
@@ -667,31 +667,31 @@
};
-GPointPair gdiam_approx_diam( gdiam_point * start, int size,
+GDIAM_EXPORT GPointPair gdiam_approx_diam( gdiam_point * start, int size,
gdiam_real eps );
-GPointPair gdiam_approx_diam( gdiam_point * start, int size,
+GDIAM_EXPORT GPointPair gdiam_approx_diam( gdiam_point * start, int size,
gdiam_real eps );
-gdiam_real gdiam_approx_diam( gdiam_real * start, int size,
+GDIAM_EXPORT gdiam_real gdiam_approx_diam( gdiam_real * start, int size,
gdiam_real eps );
-GPointPair gdiam_approx_diam_pair( gdiam_real * start, int size,
+GDIAM_EXPORT GPointPair gdiam_approx_diam_pair( gdiam_real * start, int
size,
gdiam_real eps );
-GPointPair gdiam_approx_diam_pair_UDM( gdiam_real * start, int size,
+GDIAM_EXPORT GPointPair gdiam_approx_diam_pair_UDM( gdiam_real * start, int
size,
gdiam_real eps );
-gdiam_bbox gdiam_approx_const_mvbb( gdiam_point * start, int size,
+GDIAM_EXPORT gdiam_bbox gdiam_approx_const_mvbb( gdiam_point * start, int
size,
gdiam_real eps,
GBBox * p_ap_bbox );
-gdiam_point * gdiam_convert( gdiam_real * start, int size );
-gdiam_bbox gdiam_approx_mvbb( gdiam_point * start, int size,
+GDIAM_EXPORT gdiam_point * gdiam_convert( gdiam_real * start, int size );
+GDIAM_EXPORT gdiam_bbox gdiam_approx_mvbb( gdiam_point * start, int size,
gdiam_real eps ) ;
-gdiam_bbox gdiam_approx_mvbb_grid( gdiam_point * start, int size,
+GDIAM_EXPORT gdiam_bbox gdiam_approx_mvbb_grid( gdiam_point * start, int
size,
int grid_size );
GDIAM_EXPORT gdiam_bbox gdiam_approx_mvbb_grid_sample( gdiam_point * start,
int size,
int grid_size, int sample_size );
-gdiam_bbox gdiam_approx_mvbb_grid_sample( gdiam_real * start, int size,
+GDIAM_EXPORT gdiam_bbox gdiam_approx_mvbb_grid_sample( gdiam_real * start,
int size,
int grid_size, int sample_size );
-void gdiam_generate_orthonormal_base( gdiam_point in,
+GDIAM_EXPORT void gdiam_generate_orthonormal_base( gdiam_point in,
gdiam_point out1,
gdiam_point out2 );
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Get your SQL database under version control now!
Version control is standard for application code, but databases havent
caught up. So what steps can you take to put your SQL databases under
version control? Why should you start doing it? Read more to find out.
http://pubads.g.doubleclick.net/gampad/clk?id=49501711&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
