You can subscribe to this list here.
2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(128) |
Dec
(65) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2006 |
Jan
(48) |
Feb
(132) |
Mar
(95) |
Apr
(47) |
May
(54) |
Jun
(2) |
Jul
(57) |
Aug
(109) |
Sep
(131) |
Oct
(186) |
Nov
(105) |
Dec
(78) |
2007 |
Jan
(125) |
Feb
(105) |
Mar
(52) |
Apr
(104) |
May
(63) |
Jun
(116) |
Jul
(76) |
Aug
|
Sep
(18) |
Oct
(93) |
Nov
(110) |
Dec
(169) |
2008 |
Jan
(90) |
Feb
(64) |
Mar
(41) |
Apr
(23) |
May
(6) |
Jun
(18) |
Jul
(10) |
Aug
(61) |
Sep
(139) |
Oct
(50) |
Nov
(55) |
Dec
(2) |
2009 |
Jan
|
Feb
(1) |
Mar
(62) |
Apr
(22) |
May
(17) |
Jun
(19) |
Jul
(40) |
Aug
(21) |
Sep
|
Oct
(40) |
Nov
(23) |
Dec
|
2010 |
Jan
(14) |
Feb
(40) |
Mar
(9) |
Apr
(11) |
May
(19) |
Jun
(4) |
Jul
(10) |
Aug
(22) |
Sep
(15) |
Oct
|
Nov
(2) |
Dec
|
2011 |
Jan
(13) |
Feb
(10) |
Mar
|
Apr
(13) |
May
|
Jun
|
Jul
(2) |
Aug
(4) |
Sep
|
Oct
|
Nov
|
Dec
|
2012 |
Jan
|
Feb
|
Mar
|
Apr
(33) |
May
(20) |
Jun
|
Jul
(8) |
Aug
(7) |
Sep
(2) |
Oct
|
Nov
|
Dec
|
From: <br...@us...> - 2010-08-01 06:44:33
|
Revision: 4166 http://openvrml.svn.sourceforge.net/openvrml/?rev=4166&view=rev Author: braden Date: 2010-08-01 06:44:24 +0000 (Sun, 01 Aug 2010) Log Message: ----------- Added doc-comments for OPENVRML_NODE_IMPL_UTIL_DEFINE_DO_CREATE_TYPE and supporting macros. Modified Paths: -------------- trunk/ChangeLog trunk/src/libopenvrml/openvrml/node_impl_util.cpp Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-07-12 04:50:01 UTC (rev 4165) +++ trunk/ChangeLog 2010-08-01 06:44:24 UTC (rev 4166) @@ -1,3 +1,9 @@ +2010-08-01 Braden McDaniel <br...@en...> + + * src/libopenvrml/openvrml/node_impl_util.cpp: Added doc-comments + for OPENVRML_NODE_IMPL_UTIL_DEFINE_DO_CREATE_TYPE and supporting + macros. + 2010-07-12 Braden McDaniel <br...@en...> * src/node/vrml/text.cpp Modified: trunk/src/libopenvrml/openvrml/node_impl_util.cpp =================================================================== --- trunk/src/libopenvrml/openvrml/node_impl_util.cpp 2010-07-12 04:50:01 UTC (rev 4165) +++ trunk/src/libopenvrml/openvrml/node_impl_util.cpp 2010-08-01 06:44:24 UTC (rev 4166) @@ -2,7 +2,7 @@ // // OpenVRML // -// Copyright 2005, 2006, 2007 Braden McDaniel +// Copyright 2005, 2006, 2007, 2010 Braden McDaniel // // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published by @@ -27,21 +27,130 @@ */ /** + * @def OPENVRML_NODE_INTERFACE_TUPLE_ELEM(index, tuple) + * + * @internal + * + * @brief Get an element of a node interface tuple. + * + * @param index an index value from 0–3. + * @param tuple a node interface + * <a href="http://www.boost.org/doc/libs/release/libs/preprocessor/doc/data/tuples.html">tuple</a> + * as described for use with + * @c OPENVRML_NODE_IMPL_UTIL_DEFINE_DO_CREATE_TYPE. + */ + +/** + * @def OPENVRML_DEFINE_NODE_INTERFACE(interface_tuple) + * + * @internal + * + * @brief Create an @c openvrml::node_interface from an interface tuple. + * + * @param interface_tuple a node interface + * <a href="http://www.boost.org/doc/libs/release/libs/preprocessor/doc/data/tuples.html">tuple</a> + * as described for use with + * @c OPENVRML_NODE_IMPL_UTIL_DEFINE_DO_CREATE_TYPE. + */ + +/** + * @def OPENVRML_DEFINE_SUPPORTED_INTERFACES_ELEM(r, data, i, elem) + * + * @internal + * + * @brief A helper macro used with + * @c <a href="http://www.boost.org/doc/libs/release/libs/preprocessor/doc/ref/seq_for_each_i.html"> + * BOOST_PP_SEQ_FOR_EACH_I</a>. + * + * @param r not used. + * @param data not used. + * @param i the index of the current repetition. + * @param elem a node interface + * <a href="http://www.boost.org/doc/libs/release/libs/preprocessor/doc/data/tuples.html">tuple</a> + * as described for use with + * @c OPENVRML_NODE_IMPL_UTIL_DEFINE_DO_CREATE_TYPE. + */ + +/** + * @def OPENVRML_SUPPORTED_INTERFACES_TYPE(interface_seq) + * + * @internal + * + * @brief The type of an array of supported @c openvrml::node_interface%s for + * a @c openvrml::node_metatype. + * + * This is a helper macro used in the implementation of + * @c OPENVRML_NODE_IMPL_UTIL_DEFINE_DO_CREATE_TYPE. + * + * @param interface_seq a <a href="http://www.boost.org/doc/libs/release/libs/preprocessor/doc/data/sequences.html"> + * Boost.Preprocessor sequence</a> of + * <a href="http://www.boost.org/doc/libs/release/libs/preprocessor/doc/data/tuples.html">tuples</a>, + * as provided to + * @c OPENVRML_NODE_IMPL_UTIL_DEFINE_DO_CREATE_TYPE. + */ + +/** + * @def OPENVRML_ADD_INTERFACE(node_type_obj, interface_type, supported_interface, node, handler) + * + * @internal + * + * @brief A helper macro used to implement @c OPENVRML_ADD_INTERFACE_TUPLE. + * + * @param node_type_obj a concrete @c openvrml::node_type instance. + * @param interface_type a node interface type name, in all lower-case, as + * described for use in the interface tuple + * provided to + * @c OPENVRML_NODE_IMPL_UTIL_DEFINE_DO_CREATE_TYPE. + * @param supported_interface a @c openvrml::node_interface. + * @param node a @c openvrml::node instance type. + * @param handler the name of a @p node member function that + * implements the node interface. + */ + +/** + * @def OPENVRML_ADD_INTERFACE_TUPLE(node_type_obj, node_instance_type, node_interface, interface_tuple) + * + * @internal + * + * @brief A helper macro used to implement + * @c OPENVRML_ADD_INTERFACE_ALTERNATIVE. + * + * @param node_type_obj a concrete @c openvrml::node_type instance. + * @param node_instance_type a concrete @c openvrml::node instance type. + * @param node_interface a @c openvrml::node_interface. + * @param interface_tuple a node interface + * <a href="http://www.boost.org/doc/libs/release/libs/preprocessor/doc/data/tuples.html">tuple</a> + * as described for use with + * @c OPENVRML_NODE_IMPL_UTIL_DEFINE_DO_CREATE_TYPE. + */ + +/** + * @def OPENVRML_ADD_INTERFACE_ALTERNATIVE(r, data, elem) + * + * @internal + * + * @brief A helper macro used with + * @c <a href="http://www.boost.org/doc/libs/release/libs/preprocessor/doc/ref/seq_for_each.html"> + * BOOST_PP_SEQ_FOR_EACH</a>. + * + * @param r not used. + * @param data a <a href="http://www.boost.org/doc/libs/release/libs/preprocessor/doc/data/tuples.html">Boost.Preprocessor tuple</a> consisting of + * variable names for: + * -# the @c openvrml::node_interface that is the subject of the + * current iteration; + * -# an iterator for the set of supported interfaces; + * -# the concrete @c openvrml::node_type instance; + * -# the concrete @c node type. + * @param elem + * + * This macro is used in the implementation of + * @c OPENVRML_NODE_IMPL_UTIL_DEFINE_DO_CREATE_TYPE. + */ + +/** * @def OPENVRML_NODE_IMPL_UTIL_DEFINE_DO_CREATE_TYPE(namespace_scope, node_metatype_type, node_instance_type, interface_seq) * - * @param namespace_scope the namespace scope where @p node_instance_type - * is defined. - * @param node_metatype_type the name of the concrete - * @c openvrml::node_metatype type for the node - * implementation. - * @param node_instance_type the name of the concrete @c openvrml::node type - * for the node implementation. - * @param interface_seq a <a href="http://www.boost.org/doc/libs/release/libs/preprocessor/doc/data/sequences.html"> - * Boost.Preprocessor sequence</a> of - * <a href="http://www.boost.org/doc/libs/release/libs/preprocessor/doc/data/tuples.html">tuples</a> - * defining the supported interfaces for the node - * implementation and the @p node_instance_type - * member that implements them. + * @brief Implement @c openvrml::node_metatype::do_create_type. * * @p interface_seq consists of tuples of the following form: * <pre> @@ -72,6 +181,20 @@ * * In this example, @c set_wiggly_listener, @c wiggly, and @c height_field are * all members of the @c my_node class. + * + * @param namespace_scope the namespace scope where @p node_instance_type + * is defined. + * @param node_metatype_type the name of the concrete + * @c openvrml::node_metatype type for the node + * implementation. + * @param node_instance_type the name of the concrete @c openvrml::node type + * for the node implementation. + * @param interface_seq a <a href="http://www.boost.org/doc/libs/release/libs/preprocessor/doc/data/sequences.html"> + * Boost.Preprocessor sequence</a> of + * <a href="http://www.boost.org/doc/libs/release/libs/preprocessor/doc/data/tuples.html">tuples</a> + * defining the supported interfaces for the node + * implementation and the @p node_instance_type + * member that implements them. */ /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2010-07-12 04:50:12
|
Revision: 4165 http://openvrml.svn.sourceforge.net/openvrml/?rev=4165&view=rev Author: braden Date: 2010-07-12 04:50:01 +0000 (Mon, 12 Jul 2010) Log Message: ----------- Only call FcInit for non-Windows platforms. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/src/node/vrml97/text.cpp Property Changed: ---------------- branches/0.18/ branches/0.18/src/libopenvrml/openvrml/bad_url.cpp branches/0.18/src/libopenvrml/openvrml/bad_url.h branches/0.18/src/libopenvrml/openvrml/local/proto.cpp branches/0.18/src/libopenvrml/openvrml/local/proto.h branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/libopenvrml/openvrml/scene.h branches/0.18/src/libopenvrml/openvrml/script.cpp branches/0.18/src/mozilla-plugin/ branches/0.18/src/node/vrml97/register_node_metatypes.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.h branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp branches/0.18/src/node/x3d-core/metadata_double.cpp branches/0.18/src/node/x3d-core/metadata_double.h branches/0.18/src/node/x3d-core/metadata_float.cpp branches/0.18/src/node/x3d-core/metadata_float.h branches/0.18/src/node/x3d-core/metadata_integer.cpp branches/0.18/src/node/x3d-core/metadata_integer.h branches/0.18/src/node/x3d-core/metadata_set.cpp branches/0.18/src/node/x3d-core/metadata_set.h branches/0.18/src/node/x3d-core/metadata_string.cpp branches/0.18/src/node/x3d-core/metadata_string.h branches/0.18/src/node/x3d-core/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/espdu_transform.cpp branches/0.18/src/node/x3d-dis/espdu_transform.h branches/0.18/src/node/x3d-dis/receiver_pdu.cpp branches/0.18/src/node/x3d-dis/receiver_pdu.h branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/signal_pdu.cpp branches/0.18/src/node/x3d-dis/signal_pdu.h branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp branches/0.18/src/node/x3d-dis/transmitter_pdu.h branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.h branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp branches/0.18/src/node/x3d-event-utilities/boolean_filter.h branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp branches/0.18/src/node/x3d-event-utilities/integer_trigger.h branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.h branches/0.18/src/node/x3d-geometry2d/arc2d.cpp branches/0.18/src/node/x3d-geometry2d/arc2d.h branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp branches/0.18/src/node/x3d-geometry2d/arc_close2d.h branches/0.18/src/node/x3d-geometry2d/circle2d.cpp branches/0.18/src/node/x3d-geometry2d/circle2d.h branches/0.18/src/node/x3d-geometry2d/disk2d.cpp branches/0.18/src/node/x3d-geometry2d/disk2d.h branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp branches/0.18/src/node/x3d-geometry2d/polyline2d.h branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp branches/0.18/src/node/x3d-geometry2d/polypoint2d.h branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp branches/0.18/src/node/x3d-geometry2d/rectangle2d.h branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp branches/0.18/src/node/x3d-geospatial/geo_coordinate.h branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h branches/0.18/src/node/x3d-geospatial/geo_location.cpp branches/0.18/src/node/x3d-geospatial/geo_location.h branches/0.18/src/node/x3d-geospatial/geo_lod.cpp branches/0.18/src/node/x3d-geospatial/geo_lod.h branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp branches/0.18/src/node/x3d-geospatial/geo_metadata.h branches/0.18/src/node/x3d-geospatial/geo_origin.cpp branches/0.18/src/node/x3d-geospatial/geo_origin.h branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/static_group.cpp branches/0.18/src/node/x3d-grouping/static_group.h branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp branches/0.18/src/node/x3d-h-anim/h_anim_joint.h branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp branches/0.18/src/node/x3d-h-anim/h_anim_segment.h branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp branches/0.18/src/node/x3d-h-anim/h_anim_site.h branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h branches/0.18/src/node/x3d-networking/load_sensor.cpp branches/0.18/src/node/x3d-networking/load_sensor.h branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp branches/0.18/src/node/x3d-nurbs/contour2d.cpp branches/0.18/src/node/x3d-nurbs/contour2d.h branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp branches/0.18/src/node/x3d-nurbs/coordinate_double.h branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve.h branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp branches/0.18/src/node/x3d-nurbs/nurbs_set.h branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/color_rgba.cpp branches/0.18/src/node/x3d-rendering/color_rgba.h branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.h branches/0.18/src/node/x3d-rendering/triangle_set.cpp branches/0.18/src/node/x3d-rendering/triangle_set.h branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/triangle_strip_set.h branches/0.18/src/node/x3d-shape/fill_properties.cpp branches/0.18/src/node/x3d-shape/fill_properties.h branches/0.18/src/node/x3d-shape/line_properties.cpp branches/0.18/src/node/x3d-shape/line_properties.h branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/multi_texture.cpp branches/0.18/src/node/x3d-texturing/multi_texture.h branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp branches/0.18/src/node/x3d-texturing/multi_texture_transform.h branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2010-07-12 04:46:23 UTC (rev 4164) +++ branches/0.18/ChangeLog 2010-07-12 04:50:01 UTC (rev 4165) @@ -1,3 +1,9 @@ +2010-07-12 Braden McDaniel <br...@en...> + + * src/node/vrml/text.cpp + (openvrml_node_vrml97::text_metatype::text_metatype(openvrml::browser&): + Only call FcInit for non-Windows platforms. + 2010-07-10 Braden McDaniel <br...@en...> * src/node/vrml97/text.cpp: Fixed to compile without Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164 Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 + /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164 Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164 Property changes on: branches/0.18/src/mozilla-plugin ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 + /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164 Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164 Modified: branches/0.18/src/node/vrml97/text.cpp =================================================================== --- branches/0.18/src/node/vrml97/text.cpp 2010-07-12 04:46:23 UTC (rev 4164) +++ branches/0.18/src/node/vrml97/text.cpp 2010-07-12 04:50:01 UTC (rev 4165) @@ -2761,10 +2761,12 @@ node_metatype(text_metatype::id, browser) { # ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE +# ifndef _WIN32 FcBool fc_succeeded = FcInit(); if (!fc_succeeded) { browser.err("error initializing fontconfig library"); } +# endif FT_Error ft_error = 0; ft_error = FT_Init_FreeType(&this->freeTypeLibrary); Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164 Property changes on: branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 + /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 + /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 + /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 + /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 + /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 + /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 + /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 + /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 + /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 + /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164 Property changes on: branches/0.18/src/node/x3d-core/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 + /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 + /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 + /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 + /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162,4164 Property changes on: branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 + /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,41... [truncated message content] |
From: <br...@us...> - 2010-07-12 04:46:30
|
Revision: 4164 http://openvrml.svn.sourceforge.net/openvrml/?rev=4164&view=rev Author: braden Date: 2010-07-12 04:46:23 +0000 (Mon, 12 Jul 2010) Log Message: ----------- Only call FcInit for non-Windows platforms. Modified Paths: -------------- trunk/ChangeLog trunk/src/node/vrml97/text.cpp Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-07-10 06:53:06 UTC (rev 4163) +++ trunk/ChangeLog 2010-07-12 04:46:23 UTC (rev 4164) @@ -1,3 +1,9 @@ +2010-07-12 Braden McDaniel <br...@en...> + + * src/node/vrml/text.cpp + (openvrml_node_vrml97::text_metatype::text_metatype(openvrml::browser&): + Only call FcInit for non-Windows platforms. + 2010-07-10 Braden McDaniel <br...@en...> * src/node/vrml97/text.cpp: Fixed to compile without Modified: trunk/src/node/vrml97/text.cpp =================================================================== --- trunk/src/node/vrml97/text.cpp 2010-07-10 06:53:06 UTC (rev 4163) +++ trunk/src/node/vrml97/text.cpp 2010-07-12 04:46:23 UTC (rev 4164) @@ -2764,10 +2764,12 @@ node_metatype(text_metatype::id, browser) { # ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE +# ifndef _WIN32 FcBool fc_succeeded = FcInit(); if (!fc_succeeded) { browser.err("error initializing fontconfig library"); } +# endif FT_Error ft_error = 0; ft_error = FT_Init_FreeType(&this->freeTypeLibrary); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2010-07-10 06:53:15
|
Revision: 4163 http://openvrml.svn.sourceforge.net/openvrml/?rev=4163&view=rev Author: braden Date: 2010-07-10 06:53:06 +0000 (Sat, 10 Jul 2010) Log Message: ----------- Fixed to compile without OPENVRML_ENABLE_RENDER_TEXT_NODE. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/src/node/vrml97/text.cpp Property Changed: ---------------- branches/0.18/ branches/0.18/src/libopenvrml/openvrml/bad_url.cpp branches/0.18/src/libopenvrml/openvrml/bad_url.h branches/0.18/src/libopenvrml/openvrml/local/proto.cpp branches/0.18/src/libopenvrml/openvrml/local/proto.h branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/libopenvrml/openvrml/scene.h branches/0.18/src/libopenvrml/openvrml/script.cpp branches/0.18/src/mozilla-plugin/ branches/0.18/src/node/vrml97/register_node_metatypes.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.h branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp branches/0.18/src/node/x3d-core/metadata_double.cpp branches/0.18/src/node/x3d-core/metadata_double.h branches/0.18/src/node/x3d-core/metadata_float.cpp branches/0.18/src/node/x3d-core/metadata_float.h branches/0.18/src/node/x3d-core/metadata_integer.cpp branches/0.18/src/node/x3d-core/metadata_integer.h branches/0.18/src/node/x3d-core/metadata_set.cpp branches/0.18/src/node/x3d-core/metadata_set.h branches/0.18/src/node/x3d-core/metadata_string.cpp branches/0.18/src/node/x3d-core/metadata_string.h branches/0.18/src/node/x3d-core/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/espdu_transform.cpp branches/0.18/src/node/x3d-dis/espdu_transform.h branches/0.18/src/node/x3d-dis/receiver_pdu.cpp branches/0.18/src/node/x3d-dis/receiver_pdu.h branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/signal_pdu.cpp branches/0.18/src/node/x3d-dis/signal_pdu.h branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp branches/0.18/src/node/x3d-dis/transmitter_pdu.h branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.h branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp branches/0.18/src/node/x3d-event-utilities/boolean_filter.h branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp branches/0.18/src/node/x3d-event-utilities/integer_trigger.h branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.h branches/0.18/src/node/x3d-geometry2d/arc2d.cpp branches/0.18/src/node/x3d-geometry2d/arc2d.h branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp branches/0.18/src/node/x3d-geometry2d/arc_close2d.h branches/0.18/src/node/x3d-geometry2d/circle2d.cpp branches/0.18/src/node/x3d-geometry2d/circle2d.h branches/0.18/src/node/x3d-geometry2d/disk2d.cpp branches/0.18/src/node/x3d-geometry2d/disk2d.h branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp branches/0.18/src/node/x3d-geometry2d/polyline2d.h branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp branches/0.18/src/node/x3d-geometry2d/polypoint2d.h branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp branches/0.18/src/node/x3d-geometry2d/rectangle2d.h branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp branches/0.18/src/node/x3d-geospatial/geo_coordinate.h branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h branches/0.18/src/node/x3d-geospatial/geo_location.cpp branches/0.18/src/node/x3d-geospatial/geo_location.h branches/0.18/src/node/x3d-geospatial/geo_lod.cpp branches/0.18/src/node/x3d-geospatial/geo_lod.h branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp branches/0.18/src/node/x3d-geospatial/geo_metadata.h branches/0.18/src/node/x3d-geospatial/geo_origin.cpp branches/0.18/src/node/x3d-geospatial/geo_origin.h branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/static_group.cpp branches/0.18/src/node/x3d-grouping/static_group.h branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp branches/0.18/src/node/x3d-h-anim/h_anim_joint.h branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp branches/0.18/src/node/x3d-h-anim/h_anim_segment.h branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp branches/0.18/src/node/x3d-h-anim/h_anim_site.h branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h branches/0.18/src/node/x3d-networking/load_sensor.cpp branches/0.18/src/node/x3d-networking/load_sensor.h branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp branches/0.18/src/node/x3d-nurbs/contour2d.cpp branches/0.18/src/node/x3d-nurbs/contour2d.h branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp branches/0.18/src/node/x3d-nurbs/coordinate_double.h branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve.h branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp branches/0.18/src/node/x3d-nurbs/nurbs_set.h branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/color_rgba.cpp branches/0.18/src/node/x3d-rendering/color_rgba.h branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.h branches/0.18/src/node/x3d-rendering/triangle_set.cpp branches/0.18/src/node/x3d-rendering/triangle_set.h branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/triangle_strip_set.h branches/0.18/src/node/x3d-shape/fill_properties.cpp branches/0.18/src/node/x3d-shape/fill_properties.h branches/0.18/src/node/x3d-shape/line_properties.cpp branches/0.18/src/node/x3d-shape/line_properties.h branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/multi_texture.cpp branches/0.18/src/node/x3d-texturing/multi_texture.h branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp branches/0.18/src/node/x3d-texturing/multi_texture_transform.h branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2010-07-10 06:50:29 UTC (rev 4162) +++ branches/0.18/ChangeLog 2010-07-10 06:53:06 UTC (rev 4163) @@ -1,3 +1,8 @@ +2010-07-10 Braden McDaniel <br...@en...> + + * src/node/vrml97/text.cpp: Fixed to compile without + OPENVRML_ENABLE_RENDER_TEXT_NODE. + 2010-07-09 Braden McDaniel <br...@en...> Removed OPENVRML_API from event listener/emitter class templates. Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 + /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 Property changes on: branches/0.18/src/mozilla-plugin ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 + /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 Modified: branches/0.18/src/node/vrml97/text.cpp =================================================================== --- branches/0.18/src/node/vrml97/text.cpp 2010-07-10 06:50:29 UTC (rev 4162) +++ branches/0.18/src/node/vrml97/text.cpp 2010-07-10 06:53:06 UTC (rev 4163) @@ -129,6 +129,7 @@ max_extent_exposedfield max_extent_; openvrml::sfbool solid_; +# ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE class glyph_geometry { std::vector<openvrml::vec2f> coord_; std::vector<openvrml::int32> coord_index_; @@ -224,7 +225,6 @@ boost::scoped_ptr<text_geometry> text_geometry_; -# ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE typedef std::vector<std::vector<char32_t> > ucs4_string_t; typedef std::map<FT_UInt, glyph_geometry> glyph_geometry_map_t; @@ -619,6 +619,8 @@ * @brief maxExtent exposedField. */ +# ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE + /** * @internal * @@ -653,8 +655,6 @@ * glyph. */ -# ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE - /** * @internal * @@ -1218,7 +1218,6 @@ } return 0; } -# endif // OPENVRML_ENABLE_RENDER_TEXT_NODE /** * @brief Construct from a set of contours. @@ -1237,7 +1236,6 @@ advance_width_(0), advance_height_(0) { -# ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE using std::vector; using namespace boost::multi_index::detail; // for scope_guard @@ -1280,7 +1278,6 @@ get_polygons_(glyphContours.contours); std::for_each(polygons.begin(), polygons.end(), draw_glyph_polygon(this->coord_, this->coord_index_)); -# endif // OPENVRML_ENABLE_RENDER_TEXT_NODE } /** @@ -1921,6 +1918,7 @@ * glyph_geometry_map for rapid retrieval the next time the glyph is * encountered. */ +# endif // OPENVRML_ENABLE_RENDER_TEXT_NODE /** * @var text_node::text_geometry text_node::text_geometry_ @@ -1956,8 +1954,10 @@ */ text_node::~text_node() OPENVRML_NOTHROW { +# ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE // shutdown sets this->face to 0. assert(this->face == 0); +# endif } /** @@ -1982,6 +1982,7 @@ void text_node::do_render_geometry(openvrml::viewer & v, openvrml::rendering_context) { +# ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE using openvrml::int32; if (this->text_geometry_) { v.insert_shell(*this, @@ -1995,6 +1996,7 @@ this->text_geometry_->tex_coord(), std::vector<int32>()); // texCoordIndex } +# endif if (this->font_style_.value()) { this->font_style_.value()->modified(false); } Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 Property changes on: branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 + /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 + /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 + /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 + /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 + /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 + /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 + /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 + /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 + /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 + /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 Property changes on: branches/0.18/src/node/x3d-core/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 + /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 + /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 + /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160,4162 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 + /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/s... [truncated message content] |
From: <br...@us...> - 2010-07-10 06:50:37
|
Revision: 4162 http://openvrml.svn.sourceforge.net/openvrml/?rev=4162&view=rev Author: braden Date: 2010-07-10 06:50:29 +0000 (Sat, 10 Jul 2010) Log Message: ----------- Fixed to compile without OPENVRML_ENABLE_RENDER_TEXT_NODE. Modified Paths: -------------- trunk/ChangeLog trunk/src/node/vrml97/text.cpp Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-07-09 17:05:15 UTC (rev 4161) +++ trunk/ChangeLog 2010-07-10 06:50:29 UTC (rev 4162) @@ -1,3 +1,8 @@ +2010-07-10 Braden McDaniel <br...@en...> + + * src/node/vrml97/text.cpp: Fixed to compile without + OPENVRML_ENABLE_RENDER_TEXT_NODE. + 2010-07-09 Braden McDaniel <br...@en...> Removed OPENVRML_API from event listener/emitter class templates. Modified: trunk/src/node/vrml97/text.cpp =================================================================== --- trunk/src/node/vrml97/text.cpp 2010-07-09 17:05:15 UTC (rev 4161) +++ trunk/src/node/vrml97/text.cpp 2010-07-10 06:50:29 UTC (rev 4162) @@ -130,6 +130,7 @@ max_extent_exposedfield max_extent_; openvrml::sfbool solid_; +# ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE class glyph_geometry { std::vector<openvrml::vec2f> coord_; std::vector<openvrml::int32> coord_index_; @@ -225,7 +226,6 @@ boost::scoped_ptr<text_geometry> text_geometry_; -# ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE typedef std::vector<std::vector<char32_t> > ucs4_string_t; typedef std::map<FT_UInt, glyph_geometry> glyph_geometry_map_t; @@ -620,6 +620,8 @@ * @brief maxExtent exposedField. */ +# ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE + /** * @internal * @@ -654,8 +656,6 @@ * glyph. */ -# ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE - /** * @internal * @@ -1219,7 +1219,6 @@ } return 0; } -# endif // OPENVRML_ENABLE_RENDER_TEXT_NODE /** * @brief Construct from a set of contours. @@ -1238,7 +1237,6 @@ advance_width_(0), advance_height_(0) { -# ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE using std::vector; FT_Error error = FT_Err_Ok; @@ -1282,7 +1280,6 @@ get_polygons_(glyphContours.contours); std::for_each(polygons.begin(), polygons.end(), draw_glyph_polygon(this->coord_, this->coord_index_)); -# endif // OPENVRML_ENABLE_RENDER_TEXT_NODE } /** @@ -1923,6 +1920,7 @@ * glyph_geometry_map for rapid retrieval the next time the glyph is * encountered. */ +# endif // OPENVRML_ENABLE_RENDER_TEXT_NODE /** * @var text_node::text_geometry text_node::text_geometry_ @@ -1958,8 +1956,10 @@ */ text_node::~text_node() OPENVRML_NOTHROW { +# ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE // shutdown sets this->face to 0. assert(this->face == 0); +# endif } /** @@ -1984,6 +1984,7 @@ void text_node::do_render_geometry(openvrml::viewer & v, openvrml::rendering_context) { +# ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE using openvrml::int32; if (this->text_geometry_) { v.insert_shell(*this, @@ -1997,6 +1998,7 @@ this->text_geometry_->tex_coord(), std::vector<int32>()); // texCoordIndex } +# endif if (this->font_style_.value()) { this->font_style_.value()->modified(false); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2010-07-09 17:05:23
|
Revision: 4161 http://openvrml.svn.sourceforge.net/openvrml/?rev=4161&view=rev Author: braden Date: 2010-07-09 17:05:15 +0000 (Fri, 09 Jul 2010) Log Message: ----------- Removed OPENVRML_API from event listener/emitter class templates. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/src/libopenvrml/openvrml/event.h Property Changed: ---------------- branches/0.18/ branches/0.18/src/libopenvrml/openvrml/bad_url.cpp branches/0.18/src/libopenvrml/openvrml/bad_url.h branches/0.18/src/libopenvrml/openvrml/local/proto.cpp branches/0.18/src/libopenvrml/openvrml/local/proto.h branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/libopenvrml/openvrml/scene.h branches/0.18/src/libopenvrml/openvrml/script.cpp branches/0.18/src/mozilla-plugin/ branches/0.18/src/node/vrml97/register_node_metatypes.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.h branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp branches/0.18/src/node/x3d-core/metadata_double.cpp branches/0.18/src/node/x3d-core/metadata_double.h branches/0.18/src/node/x3d-core/metadata_float.cpp branches/0.18/src/node/x3d-core/metadata_float.h branches/0.18/src/node/x3d-core/metadata_integer.cpp branches/0.18/src/node/x3d-core/metadata_integer.h branches/0.18/src/node/x3d-core/metadata_set.cpp branches/0.18/src/node/x3d-core/metadata_set.h branches/0.18/src/node/x3d-core/metadata_string.cpp branches/0.18/src/node/x3d-core/metadata_string.h branches/0.18/src/node/x3d-core/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/espdu_transform.cpp branches/0.18/src/node/x3d-dis/espdu_transform.h branches/0.18/src/node/x3d-dis/receiver_pdu.cpp branches/0.18/src/node/x3d-dis/receiver_pdu.h branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/signal_pdu.cpp branches/0.18/src/node/x3d-dis/signal_pdu.h branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp branches/0.18/src/node/x3d-dis/transmitter_pdu.h branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.h branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp branches/0.18/src/node/x3d-event-utilities/boolean_filter.h branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp branches/0.18/src/node/x3d-event-utilities/integer_trigger.h branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.h branches/0.18/src/node/x3d-geometry2d/arc2d.cpp branches/0.18/src/node/x3d-geometry2d/arc2d.h branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp branches/0.18/src/node/x3d-geometry2d/arc_close2d.h branches/0.18/src/node/x3d-geometry2d/circle2d.cpp branches/0.18/src/node/x3d-geometry2d/circle2d.h branches/0.18/src/node/x3d-geometry2d/disk2d.cpp branches/0.18/src/node/x3d-geometry2d/disk2d.h branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp branches/0.18/src/node/x3d-geometry2d/polyline2d.h branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp branches/0.18/src/node/x3d-geometry2d/polypoint2d.h branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp branches/0.18/src/node/x3d-geometry2d/rectangle2d.h branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp branches/0.18/src/node/x3d-geospatial/geo_coordinate.h branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h branches/0.18/src/node/x3d-geospatial/geo_location.cpp branches/0.18/src/node/x3d-geospatial/geo_location.h branches/0.18/src/node/x3d-geospatial/geo_lod.cpp branches/0.18/src/node/x3d-geospatial/geo_lod.h branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp branches/0.18/src/node/x3d-geospatial/geo_metadata.h branches/0.18/src/node/x3d-geospatial/geo_origin.cpp branches/0.18/src/node/x3d-geospatial/geo_origin.h branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/static_group.cpp branches/0.18/src/node/x3d-grouping/static_group.h branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp branches/0.18/src/node/x3d-h-anim/h_anim_joint.h branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp branches/0.18/src/node/x3d-h-anim/h_anim_segment.h branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp branches/0.18/src/node/x3d-h-anim/h_anim_site.h branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h branches/0.18/src/node/x3d-networking/load_sensor.cpp branches/0.18/src/node/x3d-networking/load_sensor.h branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp branches/0.18/src/node/x3d-nurbs/contour2d.cpp branches/0.18/src/node/x3d-nurbs/contour2d.h branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp branches/0.18/src/node/x3d-nurbs/coordinate_double.h branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve.h branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp branches/0.18/src/node/x3d-nurbs/nurbs_set.h branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/color_rgba.cpp branches/0.18/src/node/x3d-rendering/color_rgba.h branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.h branches/0.18/src/node/x3d-rendering/triangle_set.cpp branches/0.18/src/node/x3d-rendering/triangle_set.h branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/triangle_strip_set.h branches/0.18/src/node/x3d-shape/fill_properties.cpp branches/0.18/src/node/x3d-shape/fill_properties.h branches/0.18/src/node/x3d-shape/line_properties.cpp branches/0.18/src/node/x3d-shape/line_properties.h branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/multi_texture.cpp branches/0.18/src/node/x3d-texturing/multi_texture.h branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp branches/0.18/src/node/x3d-texturing/multi_texture_transform.h branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2010-07-09 16:50:41 UTC (rev 4160) +++ branches/0.18/ChangeLog 2010-07-09 17:05:15 UTC (rev 4161) @@ -1,5 +1,17 @@ 2010-07-09 Braden McDaniel <br...@en...> + Removed OPENVRML_API from event listener/emitter class templates. + + These trigger "inconsistent dll linkage" warnings from the + Microsoft compiler. For gcc's purposes, forcing symbol visibility + for templates should be unnecessary. + + * src/libopenvrml/openvrml/event.h + (field_value_listener): Removed OPENVRML_API. + (field_value_emitter): Removed OPENVRML_API. + +2010-07-09 Braden McDaniel <br...@en...> + * src/node/vrml97/image_texture.cpp (image_texture_node::do_render_texture(openvrml::viewer &)): Lock the image_mutex_ before rendering the texture. Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 + /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 Modified: branches/0.18/src/libopenvrml/openvrml/event.h =================================================================== --- branches/0.18/src/libopenvrml/openvrml/event.h 2010-07-09 16:50:41 UTC (rev 4160) +++ branches/0.18/src/libopenvrml/openvrml/event.h 2010-07-09 17:05:15 UTC (rev 4161) @@ -57,7 +57,7 @@ template <typename FieldValue> - class OPENVRML_API field_value_listener : public virtual event_listener { + class field_value_listener : public virtual event_listener { BOOST_CLASS_REQUIRE(FieldValue, openvrml, FieldValueConcept); public: @@ -240,7 +240,7 @@ template <typename FieldValue> - class OPENVRML_API field_value_emitter : public virtual event_emitter { + class field_value_emitter : public virtual event_emitter { BOOST_CLASS_REQUIRE(FieldValue, openvrml, FieldValueConcept); public: Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 Property changes on: branches/0.18/src/mozilla-plugin ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 + /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 Property changes on: branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 + /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 + /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 + /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 + /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 + /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 + /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 + /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 + /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 + /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 + /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 Property changes on: branches/0.18/src/node/x3d-core/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 + /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 + /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 + /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 + /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 Property changes on: branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 + /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156,4159-4160 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.cpp ____... [truncated message content] |
From: <br...@us...> - 2010-07-09 16:50:48
|
Revision: 4160 http://openvrml.svn.sourceforge.net/openvrml/?rev=4160&view=rev Author: braden Date: 2010-07-09 16:50:41 +0000 (Fri, 09 Jul 2010) Log Message: ----------- Removed OPENVRML_API from event listener/emitter class templates. Modified Paths: -------------- trunk/ChangeLog Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-07-09 16:44:47 UTC (rev 4159) +++ trunk/ChangeLog 2010-07-09 16:50:41 UTC (rev 4160) @@ -1,5 +1,17 @@ 2010-07-09 Braden McDaniel <br...@en...> + Removed OPENVRML_API from event listener/emitter class templates. + + These trigger "inconsistent dll linkage" warnings from the + Microsoft compiler. For gcc's purposes, forcing symbol visibility + for templates should be unnecessary. + + * src/libopenvrml/openvrml/event.h + (field_value_listener): Removed OPENVRML_API. + (field_value_emitter): Removed OPENVRML_API. + +2010-07-09 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/local/parse_vrml.h (openvrml::local::x3d_vrml_parse_actions::on_mfdouble): Added semantic action for mfdouble. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2010-07-09 16:44:55
|
Revision: 4159 http://openvrml.svn.sourceforge.net/openvrml/?rev=4159&view=rev Author: braden Date: 2010-07-09 16:44:47 +0000 (Fri, 09 Jul 2010) Log Message: ----------- Removed OPENVRML_API from event listener/emitter class templates. Modified Paths: -------------- trunk/src/libopenvrml/openvrml/event.h Property Changed: ---------------- trunk/ trunk/src/libopenvrml/openvrml/bad_url.cpp trunk/src/libopenvrml/openvrml/bad_url.h trunk/src/libopenvrml/openvrml/local/proto.cpp trunk/src/libopenvrml/openvrml/local/proto.h trunk/src/libopenvrml/openvrml/scene.cpp trunk/src/libopenvrml/openvrml/scene.h trunk/src/libopenvrml/openvrml/script.cpp trunk/src/mozilla-plugin/ trunk/src/node/vrml97/register_node_metatypes.cpp trunk/src/node/x3d-cad-geometry/cad_face.cpp trunk/src/node/x3d-cad-geometry/cad_face.h trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp trunk/src/node/x3d-cad-geometry/indexed_quad_set.h trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp trunk/src/node/x3d-core/metadata_double.cpp trunk/src/node/x3d-core/metadata_double.h trunk/src/node/x3d-core/metadata_float.cpp trunk/src/node/x3d-core/metadata_float.h trunk/src/node/x3d-core/metadata_integer.cpp trunk/src/node/x3d-core/metadata_integer.h trunk/src/node/x3d-core/metadata_set.cpp trunk/src/node/x3d-core/metadata_set.h trunk/src/node/x3d-core/metadata_string.cpp trunk/src/node/x3d-core/metadata_string.h trunk/src/node/x3d-core/register_node_metatypes.cpp trunk/src/node/x3d-dis/espdu_transform.cpp trunk/src/node/x3d-dis/espdu_transform.h trunk/src/node/x3d-dis/receiver_pdu.cpp trunk/src/node/x3d-dis/receiver_pdu.h trunk/src/node/x3d-dis/register_node_metatypes.cpp trunk/src/node/x3d-dis/signal_pdu.cpp trunk/src/node/x3d-dis/signal_pdu.h trunk/src/node/x3d-dis/transmitter_pdu.cpp trunk/src/node/x3d-dis/transmitter_pdu.h trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp trunk/src/node/x3d-environmental-effects/texture_background.cpp trunk/src/node/x3d-environmental-effects/texture_background.h trunk/src/node/x3d-event-utilities/boolean_filter.cpp trunk/src/node/x3d-event-utilities/boolean_filter.h trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp trunk/src/node/x3d-event-utilities/boolean_sequencer.h trunk/src/node/x3d-event-utilities/boolean_toggle.cpp trunk/src/node/x3d-event-utilities/boolean_toggle.h trunk/src/node/x3d-event-utilities/boolean_trigger.cpp trunk/src/node/x3d-event-utilities/boolean_trigger.h trunk/src/node/x3d-event-utilities/integer_sequencer.cpp trunk/src/node/x3d-event-utilities/integer_sequencer.h trunk/src/node/x3d-event-utilities/integer_trigger.cpp trunk/src/node/x3d-event-utilities/integer_trigger.h trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp trunk/src/node/x3d-event-utilities/time_trigger.cpp trunk/src/node/x3d-event-utilities/time_trigger.h trunk/src/node/x3d-geometry2d/arc2d.cpp trunk/src/node/x3d-geometry2d/arc2d.h trunk/src/node/x3d-geometry2d/arc_close2d.cpp trunk/src/node/x3d-geometry2d/arc_close2d.h trunk/src/node/x3d-geometry2d/circle2d.cpp trunk/src/node/x3d-geometry2d/circle2d.h trunk/src/node/x3d-geometry2d/disk2d.cpp trunk/src/node/x3d-geometry2d/disk2d.h trunk/src/node/x3d-geometry2d/polyline2d.cpp trunk/src/node/x3d-geometry2d/polyline2d.h trunk/src/node/x3d-geometry2d/polypoint2d.cpp trunk/src/node/x3d-geometry2d/polypoint2d.h trunk/src/node/x3d-geometry2d/rectangle2d.cpp trunk/src/node/x3d-geometry2d/rectangle2d.h trunk/src/node/x3d-geometry2d/register_node_metatypes.cpp trunk/src/node/x3d-geometry2d/triangle_set2d.cpp trunk/src/node/x3d-geometry2d/triangle_set2d.h trunk/src/node/x3d-geospatial/geo_coordinate.cpp trunk/src/node/x3d-geospatial/geo_coordinate.h trunk/src/node/x3d-geospatial/geo_elevation_grid.cpp trunk/src/node/x3d-geospatial/geo_elevation_grid.h trunk/src/node/x3d-geospatial/geo_location.cpp trunk/src/node/x3d-geospatial/geo_location.h trunk/src/node/x3d-geospatial/geo_lod.cpp trunk/src/node/x3d-geospatial/geo_lod.h trunk/src/node/x3d-geospatial/geo_metadata.cpp trunk/src/node/x3d-geospatial/geo_metadata.h trunk/src/node/x3d-geospatial/geo_origin.cpp trunk/src/node/x3d-geospatial/geo_origin.h trunk/src/node/x3d-geospatial/geo_position_interpolator.cpp trunk/src/node/x3d-geospatial/geo_position_interpolator.h trunk/src/node/x3d-geospatial/geo_touch_sensor.cpp trunk/src/node/x3d-geospatial/geo_touch_sensor.h trunk/src/node/x3d-geospatial/geo_viewpoint.cpp trunk/src/node/x3d-geospatial/geo_viewpoint.h trunk/src/node/x3d-geospatial/register_node_metatypes.cpp trunk/src/node/x3d-grouping/register_node_metatypes.cpp trunk/src/node/x3d-grouping/static_group.cpp trunk/src/node/x3d-grouping/static_group.h trunk/src/node/x3d-h-anim/h_anim_displacer.cpp trunk/src/node/x3d-h-anim/h_anim_displacer.h trunk/src/node/x3d-h-anim/h_anim_humanoid.cpp trunk/src/node/x3d-h-anim/h_anim_humanoid.h trunk/src/node/x3d-h-anim/h_anim_joint.cpp trunk/src/node/x3d-h-anim/h_anim_joint.h trunk/src/node/x3d-h-anim/h_anim_segment.cpp trunk/src/node/x3d-h-anim/h_anim_segment.h trunk/src/node/x3d-h-anim/h_anim_site.cpp trunk/src/node/x3d-h-anim/h_anim_site.h trunk/src/node/x3d-h-anim/register_node_metatypes.cpp trunk/src/node/x3d-interpolation/coordinate_interpolator2d.cpp trunk/src/node/x3d-interpolation/coordinate_interpolator2d.h trunk/src/node/x3d-interpolation/position_interpolator2d.cpp trunk/src/node/x3d-interpolation/position_interpolator2d.h trunk/src/node/x3d-interpolation/register_node_metatypes.cpp trunk/src/node/x3d-key-device-sensor/key_sensor.cpp trunk/src/node/x3d-key-device-sensor/key_sensor.h trunk/src/node/x3d-key-device-sensor/register_node_metatypes.cpp trunk/src/node/x3d-key-device-sensor/string_sensor.cpp trunk/src/node/x3d-key-device-sensor/string_sensor.h trunk/src/node/x3d-networking/load_sensor.cpp trunk/src/node/x3d-networking/load_sensor.h trunk/src/node/x3d-networking/register_node_metatypes.cpp trunk/src/node/x3d-nurbs/contour2d.cpp trunk/src/node/x3d-nurbs/contour2d.h trunk/src/node/x3d-nurbs/contour_polyline2d.cpp trunk/src/node/x3d-nurbs/contour_polyline2d.h trunk/src/node/x3d-nurbs/coordinate_double.cpp trunk/src/node/x3d-nurbs/coordinate_double.h trunk/src/node/x3d-nurbs/nurbs_curve.cpp trunk/src/node/x3d-nurbs/nurbs_curve.h trunk/src/node/x3d-nurbs/nurbs_curve2d.cpp trunk/src/node/x3d-nurbs/nurbs_curve2d.h trunk/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp trunk/src/node/x3d-nurbs/nurbs_orientation_interpolator.h trunk/src/node/x3d-nurbs/nurbs_patch_surface.cpp trunk/src/node/x3d-nurbs/nurbs_patch_surface.h trunk/src/node/x3d-nurbs/nurbs_position_interpolator.cpp trunk/src/node/x3d-nurbs/nurbs_position_interpolator.h trunk/src/node/x3d-nurbs/nurbs_set.cpp trunk/src/node/x3d-nurbs/nurbs_set.h trunk/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp trunk/src/node/x3d-nurbs/nurbs_surface_interpolator.h trunk/src/node/x3d-nurbs/nurbs_swept_surface.cpp trunk/src/node/x3d-nurbs/nurbs_swept_surface.h trunk/src/node/x3d-nurbs/nurbs_swung_surface.cpp trunk/src/node/x3d-nurbs/nurbs_swung_surface.h trunk/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp trunk/src/node/x3d-nurbs/nurbs_texture_coordinate.h trunk/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp trunk/src/node/x3d-nurbs/nurbs_trimmed_surface.h trunk/src/node/x3d-nurbs/register_node_metatypes.cpp trunk/src/node/x3d-rendering/color_rgba.cpp trunk/src/node/x3d-rendering/color_rgba.h trunk/src/node/x3d-rendering/indexed_triangle_fan_set.cpp trunk/src/node/x3d-rendering/indexed_triangle_fan_set.h trunk/src/node/x3d-rendering/indexed_triangle_set.cpp trunk/src/node/x3d-rendering/indexed_triangle_set.h trunk/src/node/x3d-rendering/indexed_triangle_strip_set.cpp trunk/src/node/x3d-rendering/indexed_triangle_strip_set.h trunk/src/node/x3d-rendering/register_node_metatypes.cpp trunk/src/node/x3d-rendering/triangle_fan_set.cpp trunk/src/node/x3d-rendering/triangle_fan_set.h trunk/src/node/x3d-rendering/triangle_set.cpp trunk/src/node/x3d-rendering/triangle_set.h trunk/src/node/x3d-rendering/triangle_strip_set.cpp trunk/src/node/x3d-rendering/triangle_strip_set.h trunk/src/node/x3d-shape/fill_properties.cpp trunk/src/node/x3d-shape/fill_properties.h trunk/src/node/x3d-shape/line_properties.cpp trunk/src/node/x3d-shape/line_properties.h trunk/src/node/x3d-shape/register_node_metatypes.cpp trunk/src/node/x3d-texturing/multi_texture.cpp trunk/src/node/x3d-texturing/multi_texture.h trunk/src/node/x3d-texturing/multi_texture_coordinate.cpp trunk/src/node/x3d-texturing/multi_texture_coordinate.h trunk/src/node/x3d-texturing/multi_texture_transform.cpp trunk/src/node/x3d-texturing/multi_texture_transform.h trunk/src/node/x3d-texturing/register_node_metatypes.cpp trunk/src/node/x3d-texturing/texture_coordinate_generator.cpp trunk/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/0.18:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/0.18:3951,3955,3960,3994,4104,4110,4152 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 Property changes on: trunk/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/0.18/src/libopenvrml/openvrml/bad_url.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/0.18/src/libopenvrml/openvrml/bad_url.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 Property changes on: trunk/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/libopenvrml/openvrml/bad_url.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 + /branches/0.18/src/libopenvrml/openvrml/bad_url.h:3951,3955,3960,3994,4104,4110,4152 /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 Modified: trunk/src/libopenvrml/openvrml/event.h =================================================================== --- trunk/src/libopenvrml/openvrml/event.h 2010-07-09 16:22:15 UTC (rev 4158) +++ trunk/src/libopenvrml/openvrml/event.h 2010-07-09 16:44:47 UTC (rev 4159) @@ -57,7 +57,7 @@ template <typename FieldValue> - class OPENVRML_API field_value_listener : public virtual event_listener { + class field_value_listener : public virtual event_listener { BOOST_CLASS_REQUIRE(FieldValue, openvrml, FieldValueConcept); public: @@ -240,7 +240,7 @@ template <typename FieldValue> - class OPENVRML_API field_value_emitter : public virtual event_emitter { + class field_value_emitter : public virtual event_emitter { BOOST_CLASS_REQUIRE(FieldValue, openvrml, FieldValueConcept); public: Property changes on: trunk/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/libopenvrml/openvrml/local/proto.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 + /branches/0.18/src/libopenvrml/openvrml/local/proto.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 Property changes on: trunk/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/libopenvrml/openvrml/local/proto.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 + /branches/0.18/src/libopenvrml/openvrml/local/proto.h:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 Property changes on: trunk/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/0.18/src/libopenvrml/openvrml/scene.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/0.18/src/libopenvrml/openvrml/scene.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 Property changes on: trunk/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/0.18/src/libopenvrml/openvrml/scene.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/0.18/src/libopenvrml/openvrml/scene.h:3951,3955,3960,3994,4104,4110,4152 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 Property changes on: trunk/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/0.18/src/libopenvrml/openvrml/script.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/0.18/src/libopenvrml/openvrml/script.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 Property changes on: trunk/src/mozilla-plugin ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/mozilla-plugin:3951,3953,3955,3960,3994,4104,4110,4152 + /branches/0.18/src/mozilla-plugin:3951,3955,3960,3994,4104,4110,4152 Property changes on: trunk/src/node/vrml97/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/0.18/src/node/vrml97/register_node_metatypes.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/0.18/src/node/vrml97/register_node_metatypes.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 Property changes on: trunk/src/node/x3d-cad-geometry/cad_face.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 + /branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 Property changes on: trunk/src/node/x3d-cad-geometry/cad_face.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-cad-geometry/cad_face.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 + /branches/0.18/src/node/x3d-cad-geometry/cad_face.h:3951,3955,3960,3994,4104,4110,4152 /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 Property changes on: trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 + /branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 Property changes on: trunk/src/node/x3d-cad-geometry/indexed_quad_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 + /branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h:3951,3955,3960,3994,4104,4110,4152 /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 Property changes on: trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 Property changes on: trunk/src/node/x3d-core/metadata_double.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-core/metadata_double.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/0.18/src/node/x3d-core/metadata_double.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 Property changes on: trunk/src/node/x3d-core/metadata_double.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-core/metadata_double.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/0.18/src/node/x3d-core/metadata_double.h:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 Property changes on: trunk/src/node/x3d-core/metadata_float.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-core/metadata_float.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/0.18/src/node/x3d-core/metadata_float.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 Property changes on: trunk/src/node/x3d-core/metadata_float.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-core/metadata_float.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/0.18/src/node/x3d-core/metadata_float.h:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 Property changes on: trunk/src/node/x3d-core/metadata_integer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-core/metadata_integer.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/0.18/src/node/x3d-core/metadata_integer.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 Property changes on: trunk/src/node/x3d-core/metadata_integer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-core/metadata_integer.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/0.18/src/node/x3d-core/metadata_integer.h:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 Property changes on: trunk/src/node/x3d-core/metadata_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-core/metadata_set.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/0.18/src/node/x3d-core/metadata_set.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 Property changes on: trunk/src/node/x3d-core/metadata_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-core/metadata_set.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/0.18/src/node/x3d-core/metadata_set.h:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 Property changes on: trunk/src/node/x3d-core/metadata_string.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-core/metadata_string.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/0.18/src/node/x3d-core/metadata_string.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 Property changes on: trunk/src/node/x3d-core/metadata_string.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-core/metadata_string.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/0.18/src/node/x3d-core/metadata_string.h:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 Property changes on: trunk/src/node/x3d-core/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/0.18/src/node/x3d-core/register_node_metatypes.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/0.18/src/node/x3d-core/register_node_metatypes.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 Property changes on: trunk/src/node/x3d-dis/espdu_transform.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-dis/espdu_transform.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 + /branches/0.18/src/node/x3d-dis/espdu_transform.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 Property changes on: trunk/src/node/x3d-dis/espdu_transform.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-dis/espdu_transform.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 + /branches/0.18/src/node/x3d-dis/espdu_transform.h:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 Property changes on: trunk/src/node/x3d-dis/receiver_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-dis/receiver_pdu.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 + /branches/0.18/src/node/x3d-dis/receiver_pdu.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 Property changes on: trunk/src/node/x3d-dis/receiver_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-dis/receiver_pdu.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 + /branches/0.18/src/node/x3d-dis/receiver_pdu.h:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 Property changes on: trunk/src/node/x3d-dis/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 + /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 Property changes on: trunk/src/node/x3d-dis/signal_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-dis/signal_pdu.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 + /branches/0.18/src/node/x3d-dis/signal_pdu.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 Property changes on: trunk/src/node/x3d-dis/signal_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-dis/signal_pdu.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 + /branches/0.18/src/node/x3d-dis/signal_pdu.h:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 Property changes on: trunk/src/node/x3d-dis/transmitter_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 + /branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 Property changes on: trunk/src/node/x3d-dis/transmitter_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-dis/transmitter_pdu.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 + /branches/0.18/src/node/x3d-dis/transmitter_pdu.h:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 Property changes on: trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 + /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 Property changes on: trunk/src/node/x3d-environmental-effects/texture_background.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 + /branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 Property changes on: trunk/src/node/x3d-environmental-effects/texture_background.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-environmental-effects/texture_background.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 + /branches/0.18/src/node/x3d-environmental-effects/texture_background.h:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 Property changes on: trunk/src/node/x3d-event-utilities/boolean_filter.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 Property changes on: trunk/src/node/x3d-event-utilities/boolean_filter.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-event-utilities/boolean_filter.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/0.18/src/node/x3d-event-utilities/boolean_filter.h:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 Property changes on: trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 Property changes on: trunk/src/node/x3d-event-utilities/boolean_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 Property changes on: trunk/src/node/x3d-event-utilities/boolean_toggle.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 Property changes on: trunk/src/node/x3d-event-utilities/boolean_toggle.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 Property changes on: trunk/src/node/x3d-event-utilities/boolean_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 Property changes on: trunk/src/node/x3d-event-utilities/boolean_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 Property changes on: trunk/src/node/x3d-event-utilities/integer_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 Property changes on: trunk/src/node/x3d-event-utilities/integer_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 Property changes on: trunk/src/node/x3d-event-utilities/integer_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 Property changes on: trunk/src/node/x3d-event-utilities/integer_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-event-utilities/integer_trigger.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/0.18/src/node/x3d-event-utilities/integer_trigger.h:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 Property changes on: trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734 + /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734 Property changes on: trunk/src/node/x3d-event-utilities/time_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/time_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/time_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 Property changes on: trunk/src/node/x3d-event-utilities/time_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-event-utilities/time_trigger.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/time_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/0.18/src/node/x3d-event-utilities/time_trigger.h:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/time_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 Property changes on: trunk/src/node/x3d-geometry2d/arc2d.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-geometry2d/arc2d.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-geometry2d/arc2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 + /branches/0.18/src/node/x3d-geometry2d/arc2d.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-geometry2d/arc2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 Property changes on: trunk/src/node/x3d-geometry2d/arc2d.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-geometry2d/arc2d.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-geometry2d/arc2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 + /branches/0.18/src/node/x3d-geometry2d/arc2d.h:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-geometry2d/arc2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 Property changes on: trunk/src/node/x3d-geometry2d/arc_close2d.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-geometry2d/arc_close2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 + /branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-geometry2d/arc_close2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 Property changes on: trunk/src/node/x3d-geometry2d/arc_close2d.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-geometry2d/arc_close2d.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-geometry2d/arc_close2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 + /branches/0.18/src/node/x3d-geometry2d/arc_close2d.h:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-geometry2d/arc_close2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc_close2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 Property changes on: trunk/src/node/x3d-geometry2d/circle2d.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-geometry2d/circle2d.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-geometry2d/circle2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/circle2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 + /branches/0.18/src/node/x3d-geometry2d/circle2d.cpp:3951,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-geometry2d/circle2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/circle2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 Property changes on: trunk/src/node/x3d-geometry2d/circle2d.h ___________________________________________________________________ Modified: svn:mergeinfo ... [truncated message content] |
From: <br...@us...> - 2010-07-09 16:22:21
|
Revision: 4158 http://openvrml.svn.sourceforge.net/openvrml/?rev=4158&view=rev Author: braden Date: 2010-07-09 16:22:15 +0000 (Fri, 09 Jul 2010) Log Message: ----------- Added semantic action for mfdouble. Modified Paths: -------------- trunk/ChangeLog trunk/src/libopenvrml/openvrml/local/parse_vrml.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-07-09 06:41:24 UTC (rev 4157) +++ trunk/ChangeLog 2010-07-09 16:22:15 UTC (rev 4158) @@ -1,5 +1,11 @@ 2010-07-09 Braden McDaniel <br...@en...> + * src/libopenvrml/openvrml/local/parse_vrml.h + (openvrml::local::x3d_vrml_parse_actions::on_mfdouble): Added + semantic action for mfdouble. + +2010-07-09 Braden McDaniel <br...@en...> + * src/node/vrml97/image_texture.cpp (image_texture_node::do_render_texture(openvrml::viewer &)): Lock the image_mutex_ before rendering the texture. Modified: trunk/src/libopenvrml/openvrml/local/parse_vrml.h =================================================================== --- trunk/src/libopenvrml/openvrml/local/parse_vrml.h 2010-07-09 06:41:24 UTC (rev 4157) +++ trunk/src/libopenvrml/openvrml/local/parse_vrml.h 2010-07-09 16:22:15 UTC (rev 4158) @@ -1205,6 +1205,7 @@ on_sfvec3d(*this), on_mfbool(*this), on_mfcolorrgba(*this), + on_mfdouble(*this), on_mfimage(*this), on_mfvec2d(*this), on_mfvec3d(*this), @@ -1370,6 +1371,23 @@ vrml97_parse_actions & actions_; } on_mfcolorrgba; + struct on_mfdouble_t { + explicit on_mfdouble_t(vrml97_parse_actions & actions): + actions_(actions) + {} + + void operator()(const std::vector<double> & val) const + { + assert(!actions_.ps.empty()); + assert(!actions_.ps.top().node_data_.empty()); + actions_.ps.top().node_data_.top() + .current_field_value->second->assign(mfdouble(val)); + } + + private: + vrml97_parse_actions & actions_; + } on_mfdouble; + struct on_mfimage_t { explicit on_mfimage_t(vrml97_parse_actions & actions): actions_(actions) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2010-07-09 06:41:32
|
Revision: 4157 http://openvrml.svn.sourceforge.net/openvrml/?rev=4157&view=rev Author: braden Date: 2010-07-09 06:41:24 +0000 (Fri, 09 Jul 2010) Log Message: ----------- Lock the image_mutex_ before rendering the texture. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/src/node/vrml97/image_texture.cpp Property Changed: ---------------- branches/0.18/ branches/0.18/src/libopenvrml/openvrml/bad_url.cpp branches/0.18/src/libopenvrml/openvrml/bad_url.h branches/0.18/src/libopenvrml/openvrml/local/proto.cpp branches/0.18/src/libopenvrml/openvrml/local/proto.h branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/libopenvrml/openvrml/scene.h branches/0.18/src/libopenvrml/openvrml/script.cpp branches/0.18/src/mozilla-plugin/ branches/0.18/src/node/vrml97/register_node_metatypes.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.h branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp branches/0.18/src/node/x3d-core/metadata_double.cpp branches/0.18/src/node/x3d-core/metadata_double.h branches/0.18/src/node/x3d-core/metadata_float.cpp branches/0.18/src/node/x3d-core/metadata_float.h branches/0.18/src/node/x3d-core/metadata_integer.cpp branches/0.18/src/node/x3d-core/metadata_integer.h branches/0.18/src/node/x3d-core/metadata_set.cpp branches/0.18/src/node/x3d-core/metadata_set.h branches/0.18/src/node/x3d-core/metadata_string.cpp branches/0.18/src/node/x3d-core/metadata_string.h branches/0.18/src/node/x3d-core/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/espdu_transform.cpp branches/0.18/src/node/x3d-dis/espdu_transform.h branches/0.18/src/node/x3d-dis/receiver_pdu.cpp branches/0.18/src/node/x3d-dis/receiver_pdu.h branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/signal_pdu.cpp branches/0.18/src/node/x3d-dis/signal_pdu.h branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp branches/0.18/src/node/x3d-dis/transmitter_pdu.h branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.h branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp branches/0.18/src/node/x3d-event-utilities/boolean_filter.h branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp branches/0.18/src/node/x3d-event-utilities/integer_trigger.h branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.h branches/0.18/src/node/x3d-geometry2d/arc2d.cpp branches/0.18/src/node/x3d-geometry2d/arc2d.h branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp branches/0.18/src/node/x3d-geometry2d/arc_close2d.h branches/0.18/src/node/x3d-geometry2d/circle2d.cpp branches/0.18/src/node/x3d-geometry2d/circle2d.h branches/0.18/src/node/x3d-geometry2d/disk2d.cpp branches/0.18/src/node/x3d-geometry2d/disk2d.h branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp branches/0.18/src/node/x3d-geometry2d/polyline2d.h branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp branches/0.18/src/node/x3d-geometry2d/polypoint2d.h branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp branches/0.18/src/node/x3d-geometry2d/rectangle2d.h branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp branches/0.18/src/node/x3d-geospatial/geo_coordinate.h branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h branches/0.18/src/node/x3d-geospatial/geo_location.cpp branches/0.18/src/node/x3d-geospatial/geo_location.h branches/0.18/src/node/x3d-geospatial/geo_lod.cpp branches/0.18/src/node/x3d-geospatial/geo_lod.h branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp branches/0.18/src/node/x3d-geospatial/geo_metadata.h branches/0.18/src/node/x3d-geospatial/geo_origin.cpp branches/0.18/src/node/x3d-geospatial/geo_origin.h branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/static_group.cpp branches/0.18/src/node/x3d-grouping/static_group.h branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp branches/0.18/src/node/x3d-h-anim/h_anim_joint.h branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp branches/0.18/src/node/x3d-h-anim/h_anim_segment.h branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp branches/0.18/src/node/x3d-h-anim/h_anim_site.h branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h branches/0.18/src/node/x3d-networking/load_sensor.cpp branches/0.18/src/node/x3d-networking/load_sensor.h branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp branches/0.18/src/node/x3d-nurbs/contour2d.cpp branches/0.18/src/node/x3d-nurbs/contour2d.h branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp branches/0.18/src/node/x3d-nurbs/coordinate_double.h branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve.h branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp branches/0.18/src/node/x3d-nurbs/nurbs_set.h branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/color_rgba.cpp branches/0.18/src/node/x3d-rendering/color_rgba.h branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.h branches/0.18/src/node/x3d-rendering/triangle_set.cpp branches/0.18/src/node/x3d-rendering/triangle_set.h branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/triangle_strip_set.h branches/0.18/src/node/x3d-shape/fill_properties.cpp branches/0.18/src/node/x3d-shape/fill_properties.h branches/0.18/src/node/x3d-shape/line_properties.cpp branches/0.18/src/node/x3d-shape/line_properties.h branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/multi_texture.cpp branches/0.18/src/node/x3d-texturing/multi_texture.h branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp branches/0.18/src/node/x3d-texturing/multi_texture_transform.h branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2010-07-09 06:37:09 UTC (rev 4156) +++ branches/0.18/ChangeLog 2010-07-09 06:41:24 UTC (rev 4157) @@ -1,3 +1,9 @@ +2010-07-09 Braden McDaniel <br...@en...> + + * src/node/vrml97/image_texture.cpp + (image_texture_node::do_render_texture(openvrml::viewer &)): Lock + the image_mutex_ before rendering the texture. + 2010-06-02 Braden McDaniel <br...@en...> Updates for 0.18.6 release. Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 Property changes on: branches/0.18/src/mozilla-plugin ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 Modified: branches/0.18/src/node/vrml97/image_texture.cpp =================================================================== --- branches/0.18/src/node/vrml97/image_texture.cpp 2010-07-09 06:37:09 UTC (rev 4156) +++ branches/0.18/src/node/vrml97/image_texture.cpp 2010-07-09 06:41:24 UTC (rev 4157) @@ -230,6 +230,7 @@ void image_texture_node::do_render_texture(openvrml::viewer & v) { this->update_texture(); + boost::shared_lock<boost::shared_mutex> lock(this->image_mutex_); v.insert_texture(*this, true); } Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 Property changes on: branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 Property changes on: branches/0.18/src/node/x3d-core/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 Property changes on: branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150,4156 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 + /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4... [truncated message content] |
From: <br...@us...> - 2010-07-09 06:37:15
|
Revision: 4156 http://openvrml.svn.sourceforge.net/openvrml/?rev=4156&view=rev Author: braden Date: 2010-07-09 06:37:09 +0000 (Fri, 09 Jul 2010) Log Message: ----------- Lock the image_mutex_ before rendering the texture. Modified Paths: -------------- trunk/ChangeLog trunk/src/node/vrml97/image_texture.cpp Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-06-06 19:11:18 UTC (rev 4155) +++ trunk/ChangeLog 2010-07-09 06:37:09 UTC (rev 4156) @@ -1,3 +1,9 @@ +2010-07-09 Braden McDaniel <br...@en...> + + * src/node/vrml97/image_texture.cpp + (image_texture_node::do_render_texture(openvrml::viewer &)): Lock + the image_mutex_ before rendering the texture. + 2010-06-06 Braden McDaniel <br...@en...> * src/libopenvrml/openvrml/x3d_vrml_grammar.h: Added MFDouble Modified: trunk/src/node/vrml97/image_texture.cpp =================================================================== --- trunk/src/node/vrml97/image_texture.cpp 2010-06-06 19:11:18 UTC (rev 4155) +++ trunk/src/node/vrml97/image_texture.cpp 2010-07-09 06:37:09 UTC (rev 4156) @@ -230,6 +230,7 @@ void image_texture_node::do_render_texture(openvrml::viewer & v) { this->update_texture(); + boost::shared_lock<boost::shared_mutex> lock(this->image_mutex_); v.insert_texture(*this, true); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2010-06-06 19:11:25
|
Revision: 4155 http://openvrml.svn.sourceforge.net/openvrml/?rev=4155&view=rev Author: braden Date: 2010-06-06 19:11:18 +0000 (Sun, 06 Jun 2010) Log Message: ----------- Added MFDouble parsing. Modified Paths: -------------- trunk/ChangeLog trunk/src/libopenvrml/openvrml/x3d_vrml_grammar.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-06-03 01:50:18 UTC (rev 4154) +++ trunk/ChangeLog 2010-06-06 19:11:18 UTC (rev 4155) @@ -1,3 +1,8 @@ +2010-06-06 Braden McDaniel <br...@en...> + + * src/libopenvrml/openvrml/x3d_vrml_grammar.h: Added MFDouble + parsing. + 2010-06-02 Braden McDaniel <br...@en...> Updates for 0.18.6 release. Modified: trunk/src/libopenvrml/openvrml/x3d_vrml_grammar.h =================================================================== --- trunk/src/libopenvrml/openvrml/x3d_vrml_grammar.h 2010-06-03 01:50:18 UTC (rev 4154) +++ trunk/src/libopenvrml/openvrml/x3d_vrml_grammar.h 2010-06-06 19:11:18 UTC (rev 4155) @@ -307,6 +307,11 @@ {} } on_mfcolorrgba; + struct on_mfdouble_t { + void operator()(const std::vector<double> & /* val */) const + {} + } on_mfdouble; + struct on_mfimage_t { void operator()(const std::vector<image> & /* val */) const {} @@ -652,6 +657,13 @@ static const boost::spirit::classic::functor_parser< typename base_t::template mftype_parser< + boost::spirit::classic::real_parser< + double, + boost::spirit::classic::real_parser_policies<double> > > > + mfdouble_p; + + static const boost::spirit::classic::functor_parser< + typename base_t::template mftype_parser< boost::spirit::classic::functor_parser<openvrml::image_parser> > > mfimage_p; @@ -692,6 +704,9 @@ case field_value::mfcolorrgba_id: r = mfcolorrgba_p[base_t::self.actions.on_mfcolorrgba]; break; + case field_value::mfdouble_id: + r = mfdouble_p[base_t::self.actions.on_mfdouble]; + break; case field_value::mfimage_id: r = mfimage_p[base_t::self.actions.on_mfimage]; break; @@ -733,6 +748,23 @@ template <typename ScannerT> const boost::spirit::classic::functor_parser< typename vrml97_grammar<Actions, ErrorHandler>::template definition<ScannerT>:: + template mftype_parser< + boost::spirit::classic::real_parser< + double, + boost::spirit::classic::real_parser_policies<double> > > > + x3d_vrml_grammar<Actions, ErrorHandler>::definition<ScannerT>::mfdouble_p = + typename vrml97_grammar<Actions, ErrorHandler>::template definition<ScannerT>:: + template mftype_parser< + boost::spirit::classic::real_parser< + double, + boost::spirit::classic::real_parser_policies<double> + > + >(boost::spirit::classic::real_p); + + template <typename Actions, typename ErrorHandler> + template <typename ScannerT> + const boost::spirit::classic::functor_parser< + typename vrml97_grammar<Actions, ErrorHandler>::template definition<ScannerT>:: template mftype_parser<boost::spirit::classic::functor_parser<openvrml::color_rgba_parser> > > x3d_vrml_grammar<Actions, ErrorHandler>::definition<ScannerT>::mfcolorrgba_p = typename vrml97_grammar<Actions, ErrorHandler>::template definition<ScannerT>:: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2010-06-03 01:50:36
|
Revision: 4154 http://openvrml.svn.sourceforge.net/openvrml/?rev=4154&view=rev Author: braden Date: 2010-06-03 01:50:18 +0000 (Thu, 03 Jun 2010) Log Message: ----------- Updates for 0.18.6 release. Modified Paths: -------------- trunk/ChangeLog trunk/NEWS trunk/doc/Doxyfile trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc trunk/src/Makefile.am Property Changed: ---------------- trunk/ trunk/src/libopenvrml/openvrml/bad_url.cpp trunk/src/libopenvrml/openvrml/bad_url.h trunk/src/libopenvrml/openvrml/local/proto.cpp trunk/src/libopenvrml/openvrml/local/proto.h trunk/src/libopenvrml/openvrml/scene.cpp trunk/src/libopenvrml/openvrml/scene.h trunk/src/libopenvrml/openvrml/script.cpp trunk/src/mozilla-plugin/ trunk/src/node/vrml97/register_node_metatypes.cpp trunk/src/node/x3d-cad-geometry/cad_face.cpp trunk/src/node/x3d-cad-geometry/cad_face.h trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp trunk/src/node/x3d-cad-geometry/indexed_quad_set.h trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp trunk/src/node/x3d-core/metadata_double.cpp trunk/src/node/x3d-core/metadata_double.h trunk/src/node/x3d-core/metadata_float.cpp trunk/src/node/x3d-core/metadata_float.h trunk/src/node/x3d-core/metadata_integer.cpp trunk/src/node/x3d-core/metadata_integer.h trunk/src/node/x3d-core/metadata_set.cpp trunk/src/node/x3d-core/metadata_set.h trunk/src/node/x3d-core/metadata_string.cpp trunk/src/node/x3d-core/metadata_string.h trunk/src/node/x3d-core/register_node_metatypes.cpp trunk/src/node/x3d-dis/espdu_transform.cpp trunk/src/node/x3d-dis/espdu_transform.h trunk/src/node/x3d-dis/receiver_pdu.cpp trunk/src/node/x3d-dis/receiver_pdu.h trunk/src/node/x3d-dis/register_node_metatypes.cpp trunk/src/node/x3d-dis/signal_pdu.cpp trunk/src/node/x3d-dis/signal_pdu.h trunk/src/node/x3d-dis/transmitter_pdu.cpp trunk/src/node/x3d-dis/transmitter_pdu.h trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp trunk/src/node/x3d-environmental-effects/texture_background.cpp trunk/src/node/x3d-environmental-effects/texture_background.h trunk/src/node/x3d-event-utilities/boolean_filter.cpp trunk/src/node/x3d-event-utilities/boolean_filter.h trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp trunk/src/node/x3d-event-utilities/boolean_sequencer.h trunk/src/node/x3d-event-utilities/boolean_toggle.cpp trunk/src/node/x3d-event-utilities/boolean_toggle.h trunk/src/node/x3d-event-utilities/boolean_trigger.cpp trunk/src/node/x3d-event-utilities/boolean_trigger.h trunk/src/node/x3d-event-utilities/integer_sequencer.cpp trunk/src/node/x3d-event-utilities/integer_sequencer.h trunk/src/node/x3d-event-utilities/integer_trigger.cpp trunk/src/node/x3d-event-utilities/integer_trigger.h trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp trunk/src/node/x3d-event-utilities/time_trigger.cpp trunk/src/node/x3d-event-utilities/time_trigger.h trunk/src/node/x3d-geometry2d/arc2d.cpp trunk/src/node/x3d-geometry2d/arc2d.h trunk/src/node/x3d-geometry2d/arc_close2d.cpp trunk/src/node/x3d-geometry2d/arc_close2d.h trunk/src/node/x3d-geometry2d/circle2d.cpp trunk/src/node/x3d-geometry2d/circle2d.h trunk/src/node/x3d-geometry2d/disk2d.cpp trunk/src/node/x3d-geometry2d/disk2d.h trunk/src/node/x3d-geometry2d/polyline2d.cpp trunk/src/node/x3d-geometry2d/polyline2d.h trunk/src/node/x3d-geometry2d/polypoint2d.cpp trunk/src/node/x3d-geometry2d/polypoint2d.h trunk/src/node/x3d-geometry2d/rectangle2d.cpp trunk/src/node/x3d-geometry2d/rectangle2d.h trunk/src/node/x3d-geometry2d/register_node_metatypes.cpp trunk/src/node/x3d-geometry2d/triangle_set2d.cpp trunk/src/node/x3d-geometry2d/triangle_set2d.h trunk/src/node/x3d-geospatial/geo_coordinate.cpp trunk/src/node/x3d-geospatial/geo_coordinate.h trunk/src/node/x3d-geospatial/geo_elevation_grid.cpp trunk/src/node/x3d-geospatial/geo_elevation_grid.h trunk/src/node/x3d-geospatial/geo_location.cpp trunk/src/node/x3d-geospatial/geo_location.h trunk/src/node/x3d-geospatial/geo_lod.cpp trunk/src/node/x3d-geospatial/geo_lod.h trunk/src/node/x3d-geospatial/geo_metadata.cpp trunk/src/node/x3d-geospatial/geo_metadata.h trunk/src/node/x3d-geospatial/geo_origin.cpp trunk/src/node/x3d-geospatial/geo_origin.h trunk/src/node/x3d-geospatial/geo_position_interpolator.cpp trunk/src/node/x3d-geospatial/geo_position_interpolator.h trunk/src/node/x3d-geospatial/geo_touch_sensor.cpp trunk/src/node/x3d-geospatial/geo_touch_sensor.h trunk/src/node/x3d-geospatial/geo_viewpoint.cpp trunk/src/node/x3d-geospatial/geo_viewpoint.h trunk/src/node/x3d-geospatial/register_node_metatypes.cpp trunk/src/node/x3d-grouping/register_node_metatypes.cpp trunk/src/node/x3d-grouping/static_group.cpp trunk/src/node/x3d-grouping/static_group.h trunk/src/node/x3d-h-anim/h_anim_displacer.cpp trunk/src/node/x3d-h-anim/h_anim_displacer.h trunk/src/node/x3d-h-anim/h_anim_humanoid.cpp trunk/src/node/x3d-h-anim/h_anim_humanoid.h trunk/src/node/x3d-h-anim/h_anim_joint.cpp trunk/src/node/x3d-h-anim/h_anim_joint.h trunk/src/node/x3d-h-anim/h_anim_segment.cpp trunk/src/node/x3d-h-anim/h_anim_segment.h trunk/src/node/x3d-h-anim/h_anim_site.cpp trunk/src/node/x3d-h-anim/h_anim_site.h trunk/src/node/x3d-h-anim/register_node_metatypes.cpp trunk/src/node/x3d-interpolation/coordinate_interpolator2d.cpp trunk/src/node/x3d-interpolation/coordinate_interpolator2d.h trunk/src/node/x3d-interpolation/position_interpolator2d.cpp trunk/src/node/x3d-interpolation/position_interpolator2d.h trunk/src/node/x3d-interpolation/register_node_metatypes.cpp trunk/src/node/x3d-key-device-sensor/key_sensor.cpp trunk/src/node/x3d-key-device-sensor/key_sensor.h trunk/src/node/x3d-key-device-sensor/register_node_metatypes.cpp trunk/src/node/x3d-key-device-sensor/string_sensor.cpp trunk/src/node/x3d-key-device-sensor/string_sensor.h trunk/src/node/x3d-networking/load_sensor.cpp trunk/src/node/x3d-networking/load_sensor.h trunk/src/node/x3d-networking/register_node_metatypes.cpp trunk/src/node/x3d-nurbs/contour2d.cpp trunk/src/node/x3d-nurbs/contour2d.h trunk/src/node/x3d-nurbs/contour_polyline2d.cpp trunk/src/node/x3d-nurbs/contour_polyline2d.h trunk/src/node/x3d-nurbs/coordinate_double.cpp trunk/src/node/x3d-nurbs/coordinate_double.h trunk/src/node/x3d-nurbs/nurbs_curve.cpp trunk/src/node/x3d-nurbs/nurbs_curve.h trunk/src/node/x3d-nurbs/nurbs_curve2d.cpp trunk/src/node/x3d-nurbs/nurbs_curve2d.h trunk/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp trunk/src/node/x3d-nurbs/nurbs_orientation_interpolator.h trunk/src/node/x3d-nurbs/nurbs_patch_surface.cpp trunk/src/node/x3d-nurbs/nurbs_patch_surface.h trunk/src/node/x3d-nurbs/nurbs_position_interpolator.cpp trunk/src/node/x3d-nurbs/nurbs_position_interpolator.h trunk/src/node/x3d-nurbs/nurbs_set.cpp trunk/src/node/x3d-nurbs/nurbs_set.h trunk/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp trunk/src/node/x3d-nurbs/nurbs_surface_interpolator.h trunk/src/node/x3d-nurbs/nurbs_swept_surface.cpp trunk/src/node/x3d-nurbs/nurbs_swept_surface.h trunk/src/node/x3d-nurbs/nurbs_swung_surface.cpp trunk/src/node/x3d-nurbs/nurbs_swung_surface.h trunk/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp trunk/src/node/x3d-nurbs/nurbs_texture_coordinate.h trunk/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp trunk/src/node/x3d-nurbs/nurbs_trimmed_surface.h trunk/src/node/x3d-nurbs/register_node_metatypes.cpp trunk/src/node/x3d-rendering/color_rgba.cpp trunk/src/node/x3d-rendering/color_rgba.h trunk/src/node/x3d-rendering/indexed_triangle_fan_set.cpp trunk/src/node/x3d-rendering/indexed_triangle_fan_set.h trunk/src/node/x3d-rendering/indexed_triangle_set.cpp trunk/src/node/x3d-rendering/indexed_triangle_set.h trunk/src/node/x3d-rendering/indexed_triangle_strip_set.cpp trunk/src/node/x3d-rendering/indexed_triangle_strip_set.h trunk/src/node/x3d-rendering/register_node_metatypes.cpp trunk/src/node/x3d-rendering/triangle_fan_set.cpp trunk/src/node/x3d-rendering/triangle_fan_set.h trunk/src/node/x3d-rendering/triangle_set.cpp trunk/src/node/x3d-rendering/triangle_set.h trunk/src/node/x3d-rendering/triangle_strip_set.cpp trunk/src/node/x3d-rendering/triangle_strip_set.h trunk/src/node/x3d-shape/fill_properties.cpp trunk/src/node/x3d-shape/fill_properties.h trunk/src/node/x3d-shape/line_properties.cpp trunk/src/node/x3d-shape/line_properties.h trunk/src/node/x3d-shape/register_node_metatypes.cpp trunk/src/node/x3d-texturing/multi_texture.cpp trunk/src/node/x3d-texturing/multi_texture.h trunk/src/node/x3d-texturing/multi_texture_coordinate.cpp trunk/src/node/x3d-texturing/multi_texture_coordinate.h trunk/src/node/x3d-texturing/multi_texture_transform.cpp trunk/src/node/x3d-texturing/multi_texture_transform.h trunk/src/node/x3d-texturing/register_node_metatypes.cpp trunk/src/node/x3d-texturing/texture_coordinate_generator.cpp trunk/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/0.18:3951,3953,3955,3960,3994,4104,4110 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/0.18:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-06-03 01:35:51 UTC (rev 4153) +++ trunk/ChangeLog 2010-06-03 01:50:18 UTC (rev 4154) @@ -1,3 +1,17 @@ +2010-06-02 Braden McDaniel <br...@en...> + + Updates for 0.18.6 release. + + * README + * NEWS + * configure.ac + * doc/Doxyfile + * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc + * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj + * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc + * src/Makefile.am + (LIBOPENVRML_LIBRARY_VERSION): Update to 9:4:0. + 2010-05-28 Braden McDaniel <br...@en...> Use jpeg_decompress_struct.out_color_components to determine the Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2010-06-03 01:35:51 UTC (rev 4153) +++ trunk/NEWS 2010-06-03 01:50:18 UTC (rev 4154) @@ -1,3 +1,12 @@ +Changes new in version 0.18.6, 2 June, 2010 +======================================================================== + +- Fixed memory corruption issues in the PNG and JPEG readers when + reading grayscale images. + +- Fixed memory leaks in Text node rendering. + + Changes new in version 0.18.5, 15 February, 2010 ======================================================================== Modified: trunk/doc/Doxyfile =================================================================== --- trunk/doc/Doxyfile 2010-06-03 01:35:51 UTC (rev 4153) +++ trunk/doc/Doxyfile 2010-06-03 01:50:18 UTC (rev 4154) @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = OpenVRML -PROJECT_NUMBER = 0.18.5 +PROJECT_NUMBER = 0.18.6 OUTPUT_DIRECTORY = CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc =================================================================== --- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc 2010-06-03 01:35:51 UTC (rev 4153) +++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc 2010-06-03 01:50:18 UTC (rev 4154) @@ -11,8 +11,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 9,3,0,0 - PRODUCTVERSION 0,18,5,0 + FILEVERSION 9,4,0,0 + PRODUCTVERSION 0,18,6,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -28,7 +28,7 @@ BLOCK "040904b0" BEGIN VALUE "FileDescription", "OpenVRML Library" - VALUE "FileVersion", "9, 3, 0, 0" + VALUE "FileVersion", "9, 4, 0, 0" VALUE "InternalName", "openvrml" VALUE "LegalCopyright", "Copyright (C) 2010" VALUE "OriginalFilename", "openvrml.dll" Modified: trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc =================================================================== --- trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc 2010-06-03 01:35:51 UTC (rev 4153) +++ trunk/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc 2010-06-03 01:50:18 UTC (rev 4154) @@ -12,7 +12,7 @@ VS_VERSION_INFO VERSIONINFO FILEVERSION 8,0,0,0 - PRODUCTVERSION 0,18,5,0 + PRODUCTVERSION 0,18,6,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2010-06-03 01:35:51 UTC (rev 4153) +++ trunk/src/Makefile.am 2010-06-03 01:50:18 UTC (rev 4154) @@ -47,7 +47,7 @@ libopenvrml/private.h \ openvrml-player/filechooserdialog.h -LIBOPENVRML_LIBRARY_VERSION = 9:3:0 +LIBOPENVRML_LIBRARY_VERSION = 9:4:0 LIBOPENVRML_GL_LIBRARY_VERSION = 8:0:0 # | | | # +------+ | +---+ Property changes on: trunk/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/0.18/src/libopenvrml/openvrml/bad_url.cpp:3951,3953,3955,3960,3994,4104,4110 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/0.18/src/libopenvrml/openvrml/bad_url.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 Property changes on: trunk/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/libopenvrml/openvrml/bad_url.h:3951,3953,3955,3960,3994,4104,4110 /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 + /branches/0.18/src/libopenvrml/openvrml/bad_url.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 Property changes on: trunk/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/libopenvrml/openvrml/local/proto.cpp:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 + /branches/0.18/src/libopenvrml/openvrml/local/proto.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 Property changes on: trunk/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/libopenvrml/openvrml/local/proto.h:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 + /branches/0.18/src/libopenvrml/openvrml/local/proto.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 Property changes on: trunk/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/0.18/src/libopenvrml/openvrml/scene.cpp:3951,3953,3955,3960,3994,4104,4110 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/0.18/src/libopenvrml/openvrml/scene.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 Property changes on: trunk/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/0.18/src/libopenvrml/openvrml/scene.h:3951,3953,3955,3960,3994,4104,4110 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/0.18/src/libopenvrml/openvrml/scene.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 Property changes on: trunk/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/0.18/src/libopenvrml/openvrml/script.cpp:3951,3953,3955,3960,3994,4104,4110 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/0.18/src/libopenvrml/openvrml/script.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 Property changes on: trunk/src/mozilla-plugin ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/mozilla-plugin:3951,3953,3955,3960,3994,4104,4110 + /branches/0.18/src/mozilla-plugin:3951,3953,3955,3960,3994,4104,4110,4152 Property changes on: trunk/src/node/vrml97/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/0.18/src/node/vrml97/register_node_metatypes.cpp:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/0.18/src/node/vrml97/register_node_metatypes.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 Property changes on: trunk/src/node/x3d-cad-geometry/cad_face.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp:3951,3953,3955,3960,3994,4104,4110 /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 + /branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 Property changes on: trunk/src/node/x3d-cad-geometry/cad_face.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-cad-geometry/cad_face.h:3951,3953,3955,3960,3994,4104,4110 /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 + /branches/0.18/src/node/x3d-cad-geometry/cad_face.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 Property changes on: trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3951,3953,3955,3960,3994,4104,4110 /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 + /branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 Property changes on: trunk/src/node/x3d-cad-geometry/indexed_quad_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h:3951,3953,3955,3960,3994,4104,4110 /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 + /branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 Property changes on: trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 Property changes on: trunk/src/node/x3d-core/metadata_double.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-core/metadata_double.cpp:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/0.18/src/node/x3d-core/metadata_double.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 Property changes on: trunk/src/node/x3d-core/metadata_double.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-core/metadata_double.h:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/0.18/src/node/x3d-core/metadata_double.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 Property changes on: trunk/src/node/x3d-core/metadata_float.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-core/metadata_float.cpp:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/0.18/src/node/x3d-core/metadata_float.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 Property changes on: trunk/src/node/x3d-core/metadata_float.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-core/metadata_float.h:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/0.18/src/node/x3d-core/metadata_float.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 Property changes on: trunk/src/node/x3d-core/metadata_integer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-core/metadata_integer.cpp:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/0.18/src/node/x3d-core/metadata_integer.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 Property changes on: trunk/src/node/x3d-core/metadata_integer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-core/metadata_integer.h:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/0.18/src/node/x3d-core/metadata_integer.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 Property changes on: trunk/src/node/x3d-core/metadata_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-core/metadata_set.cpp:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/0.18/src/node/x3d-core/metadata_set.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 Property changes on: trunk/src/node/x3d-core/metadata_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-core/metadata_set.h:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/0.18/src/node/x3d-core/metadata_set.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 Property changes on: trunk/src/node/x3d-core/metadata_string.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-core/metadata_string.cpp:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/0.18/src/node/x3d-core/metadata_string.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 Property changes on: trunk/src/node/x3d-core/metadata_string.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-core/metadata_string.h:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 + /branches/0.18/src/node/x3d-core/metadata_string.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 Property changes on: trunk/src/node/x3d-core/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/0.18/src/node/x3d-core/register_node_metatypes.cpp:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/0.18/src/node/x3d-core/register_node_metatypes.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 Property changes on: trunk/src/node/x3d-dis/espdu_transform.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-dis/espdu_transform.cpp:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 + /branches/0.18/src/node/x3d-dis/espdu_transform.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 Property changes on: trunk/src/node/x3d-dis/espdu_transform.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-dis/espdu_transform.h:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 + /branches/0.18/src/node/x3d-dis/espdu_transform.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 Property changes on: trunk/src/node/x3d-dis/receiver_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-dis/receiver_pdu.cpp:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 + /branches/0.18/src/node/x3d-dis/receiver_pdu.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 Property changes on: trunk/src/node/x3d-dis/receiver_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-dis/receiver_pdu.h:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 + /branches/0.18/src/node/x3d-dis/receiver_pdu.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 Property changes on: trunk/src/node/x3d-dis/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 + /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 Property changes on: trunk/src/node/x3d-dis/signal_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-dis/signal_pdu.cpp:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 + /branches/0.18/src/node/x3d-dis/signal_pdu.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 Property changes on: trunk/src/node/x3d-dis/signal_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-dis/signal_pdu.h:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 + /branches/0.18/src/node/x3d-dis/signal_pdu.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 Property changes on: trunk/src/node/x3d-dis/transmitter_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 + /branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-dis/transmitter_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 Property changes on: trunk/src/node/x3d-dis/transmitter_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-dis/transmitter_pdu.h:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 + /branches/0.18/src/node/x3d-dis/transmitter_pdu.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-dis/transmitter_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/transmitter_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 Property changes on: trunk/src/node/x3d-environmental-effects/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 + /branches/0.17/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3734 Property changes on: trunk/src/node/x3d-environmental-effects/texture_background.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 + /branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-environmental-effects/texture_background.cpp:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.cpp:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 Property changes on: trunk/src/node/x3d-environmental-effects/texture_background.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-environmental-effects/texture_background.h:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 + /branches/0.18/src/node/x3d-environmental-effects/texture_background.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-environmental-effects/texture_background.h:3677-3689 /branches/node-modules/src/node/x3d-environmental-effects/texture_background.h:3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_environmental_effects.cpp:3401-3630 Property changes on: trunk/src/node/x3d-event-utilities/boolean_filter.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/boolean_filter.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 Property changes on: trunk/src/node/x3d-event-utilities/boolean_filter.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-event-utilities/boolean_filter.h:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/0.18/src/node/x3d-event-utilities/boolean_filter.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/boolean_filter.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_filter.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 Property changes on: trunk/src/node/x3d-event-utilities/boolean_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/boolean_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 Property changes on: trunk/src/node/x3d-event-utilities/boolean_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/boolean_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 Property changes on: trunk/src/node/x3d-event-utilities/boolean_toggle.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/boolean_toggle.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 Property changes on: trunk/src/node/x3d-event-utilities/boolean_toggle.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/boolean_toggle.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_toggle.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 Property changes on: trunk/src/node/x3d-event-utilities/boolean_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/boolean_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 Property changes on: trunk/src/node/x3d-event-utilities/boolean_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/boolean_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/boolean_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 Property changes on: trunk/src/node/x3d-event-utilities/integer_sequencer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/integer_sequencer.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 Property changes on: trunk/src/node/x3d-event-utilities/integer_sequencer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/integer_sequencer.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_sequencer.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 Property changes on: trunk/src/node/x3d-event-utilities/integer_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/integer_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 Property changes on: trunk/src/node/x3d-event-utilities/integer_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-event-utilities/integer_trigger.h:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/0.18/src/node/x3d-event-utilities/integer_trigger.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/integer_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/integer_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 Property changes on: trunk/src/node/x3d-event-utilities/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734 + /branches/0.17/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3734 Property changes on: trunk/src/node/x3d-event-utilities/time_trigger.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-event-utilities/time_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/time_trigger.cpp:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.cpp:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 Property changes on: trunk/src/node/x3d-event-utilities/time_trigger.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-event-utilities/time_trigger.h:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-event-utilities/time_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 + /branches/0.18/src/node/x3d-event-utilities/time_trigger.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-event-utilities/time_trigger.h:3677-3689 /branches/node-modules/src/node/x3d-event-utilities/time_trigger.h:3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_event_utilities.cpp:3401-3630 Property changes on: trunk/src/node/x3d-geometry2d/arc2d.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-geometry2d/arc2d.cpp:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-geometry2d/arc2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 + /branches/0.18/src/node/x3d-geometry2d/arc2d.cpp:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-geometry2d/arc2d.cpp:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc2d.cpp:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 Property changes on: trunk/src/node/x3d-geometry2d/arc2d.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.18/src/node/x3d-geometry2d/arc2d.h:3951,3953,3955,3960,3994,4104,4110 /branches/local/src/node/x3d-geometry2d/arc2d.h:3677-3689 /branches/node-modules/src/node/x3d-geometry2d/arc2d.h:3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_geometry2d.cpp:3401-3630 + /branches/0.18/src/node/x3d-geometry2d/arc2d.h:3951,3953,3955,3960,3994,4104,4110,4152 /branches/local/src/node/x3d-geometry2d/arc2d.h:3677-3689 /bran... [truncated message content] |
From: <br...@us...> - 2010-06-03 01:35:57
|
Revision: 4153 http://openvrml.svn.sourceforge.net/openvrml/?rev=4153&view=rev Author: braden Date: 2010-06-03 01:35:51 +0000 (Thu, 03 Jun 2010) Log Message: ----------- Tagged 0.18.6 release. Added Paths: ----------- tags/0.18.6/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2010-06-03 01:33:53
|
Revision: 4152 http://openvrml.svn.sourceforge.net/openvrml/?rev=4152&view=rev Author: braden Date: 2010-06-03 01:33:47 +0000 (Thu, 03 Jun 2010) Log Message: ----------- Updates for 0.18.6 release. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/NEWS branches/0.18/README branches/0.18/configure.ac branches/0.18/doc/Doxyfile branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc branches/0.18/src/Makefile.am Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2010-05-28 15:19:57 UTC (rev 4151) +++ branches/0.18/ChangeLog 2010-06-03 01:33:47 UTC (rev 4152) @@ -1,3 +1,17 @@ +2010-06-02 Braden McDaniel <br...@en...> + + Updates for 0.18.6 release. + + * README + * NEWS + * configure.ac + * doc/Doxyfile + * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc + * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj + * ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc + * src/Makefile.am + (LIBOPENVRML_LIBRARY_VERSION): Update to 9:4:0. + 2010-05-28 Braden McDaniel <br...@en...> Use jpeg_decompress_struct.out_color_components to determine the Modified: branches/0.18/NEWS =================================================================== --- branches/0.18/NEWS 2010-05-28 15:19:57 UTC (rev 4151) +++ branches/0.18/NEWS 2010-06-03 01:33:47 UTC (rev 4152) @@ -1,3 +1,12 @@ +Changes new in version 0.18.6, 2 June, 2010 +======================================================================== + +- Fixed memory corruption issues in the PNG and JPEG readers when + reading grayscale images. + +- Fixed memory leaks in Text node rendering. + + Changes new in version 0.18.5, 15 February, 2010 ======================================================================== Modified: branches/0.18/README =================================================================== --- branches/0.18/README 2010-05-28 15:19:57 UTC (rev 4151) +++ branches/0.18/README 2010-06-03 01:33:47 UTC (rev 4152) @@ -1,4 +1,4 @@ -OpenVRML library version 0.18.5 +OpenVRML library version 0.18.6 Copyright 1998, 1999, 2000 Chris Morley <cm...@ve...> Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Braden McDaniel <br...@en...> Modified: branches/0.18/configure.ac =================================================================== --- branches/0.18/configure.ac 2010-05-28 15:19:57 UTC (rev 4151) +++ branches/0.18/configure.ac 2010-06-03 01:33:47 UTC (rev 4152) @@ -1,4 +1,4 @@ -AC_INIT([OpenVRML], [0.18.5], [ope...@li...]) +AC_INIT([OpenVRML], [0.18.6], [ope...@li...]) AC_PREREQ([2.59]) AC_COPYRIGHT([Portions copyright 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Braden McDaniel]) AC_CONFIG_MACRO_DIR([m4]) Modified: branches/0.18/doc/Doxyfile =================================================================== --- branches/0.18/doc/Doxyfile 2010-05-28 15:19:57 UTC (rev 4151) +++ branches/0.18/doc/Doxyfile 2010-06-03 01:33:47 UTC (rev 4152) @@ -5,7 +5,7 @@ #--------------------------------------------------------------------------- DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = OpenVRML -PROJECT_NUMBER = 0.18.5 +PROJECT_NUMBER = 0.18.6 OUTPUT_DIRECTORY = CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English Modified: branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc =================================================================== --- branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc 2010-05-28 15:19:57 UTC (rev 4151) +++ branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.rc 2010-06-03 01:33:47 UTC (rev 4152) @@ -11,8 +11,8 @@ // VS_VERSION_INFO VERSIONINFO - FILEVERSION 9,3,0,0 - PRODUCTVERSION 0,18,5,0 + FILEVERSION 9,4,0,0 + PRODUCTVERSION 0,18,6,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -28,12 +28,12 @@ BLOCK "040904b0" BEGIN VALUE "FileDescription", "OpenVRML Library" - VALUE "FileVersion", "9, 3, 0, 0" + VALUE "FileVersion", "9, 4, 0, 0" VALUE "InternalName", "openvrml" VALUE "LegalCopyright", "Copyright (C) 2010" VALUE "OriginalFilename", "openvrml.dll" VALUE "ProductName", "OpenVRML Library" - VALUE "ProductVersion", "0.18.5" + VALUE "ProductVersion", "0.18.6" END END BLOCK "VarFileInfo" Modified: branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj =================================================================== --- branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2010-05-28 15:19:57 UTC (rev 4151) +++ branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml/openvrml.vcproj 2010-06-03 01:33:47 UTC (rev 4152) @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\src\local\libopenvrml-dl" - PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION=\"0.18.5\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\"" + PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;PACKAGE_VERSION=\"0.18.6\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\"" MinimalRebuild="false" BasicRuntimeChecks="0" RuntimeLibrary="3" @@ -127,7 +127,7 @@ InlineFunctionExpansion="1" OmitFramePointers="true" AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\src\local\libopenvrml-dl" - PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION=\"0.18.5\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\";NDEBUG" + PreprocessorDefinitions="NOMINMAX;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_SECURE_SCL=0;PACKAGE_VERSION=\"0.18.6\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL;OPENVRML_PKGDATADIR_=\"\";OPENVRML_PKGLIBDIR_=\"\";NDEBUG" StringPooling="true" RuntimeLibrary="2" EnableFunctionLevelLinking="true" Modified: branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc =================================================================== --- branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc 2010-05-28 15:19:57 UTC (rev 4151) +++ branches/0.18/ide-projects/Windows/VisualC9_0/OpenVRML/openvrml-gl/openvrml-gl.rc 2010-06-03 01:33:47 UTC (rev 4152) @@ -12,7 +12,7 @@ VS_VERSION_INFO VERSIONINFO FILEVERSION 8,0,0,0 - PRODUCTVERSION 0,18,5,0 + PRODUCTVERSION 0,18,6,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -33,7 +33,7 @@ VALUE "LegalCopyright", "Copyright (C) 2010" VALUE "OriginalFilename", "openvrml-gl.dll" VALUE "ProductName", "OpenVRML Library" - VALUE "ProductVersion", "0.18.5" + VALUE "ProductVersion", "0.18.6" END END BLOCK "VarFileInfo" Modified: branches/0.18/src/Makefile.am =================================================================== --- branches/0.18/src/Makefile.am 2010-05-28 15:19:57 UTC (rev 4151) +++ branches/0.18/src/Makefile.am 2010-06-03 01:33:47 UTC (rev 4152) @@ -47,7 +47,7 @@ libopenvrml/private.h \ openvrml-player/filechooserdialog.h -LIBOPENVRML_LIBRARY_VERSION = 9:3:0 +LIBOPENVRML_LIBRARY_VERSION = 9:4:0 LIBOPENVRML_GL_LIBRARY_VERSION = 8:0:0 # | | | # +------+ | +---+ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2010-05-28 15:20:05
|
Revision: 4151 http://openvrml.svn.sourceforge.net/openvrml/?rev=4151&view=rev Author: braden Date: 2010-05-28 15:19:57 +0000 (Fri, 28 May 2010) Log Message: ----------- Use jpeg_decompress_struct.out_color_components to determine the scan line buffer size. This addresses a memory corruption issue when reading grayscale JPEGs. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/src/node/vrml97/image_stream_listener.cpp Property Changed: ---------------- branches/0.18/ branches/0.18/src/libopenvrml/openvrml/bad_url.cpp branches/0.18/src/libopenvrml/openvrml/bad_url.h branches/0.18/src/libopenvrml/openvrml/local/proto.cpp branches/0.18/src/libopenvrml/openvrml/local/proto.h branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/libopenvrml/openvrml/scene.h branches/0.18/src/libopenvrml/openvrml/script.cpp branches/0.18/src/mozilla-plugin/ branches/0.18/src/node/vrml97/register_node_metatypes.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.h branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp branches/0.18/src/node/x3d-core/metadata_double.cpp branches/0.18/src/node/x3d-core/metadata_double.h branches/0.18/src/node/x3d-core/metadata_float.cpp branches/0.18/src/node/x3d-core/metadata_float.h branches/0.18/src/node/x3d-core/metadata_integer.cpp branches/0.18/src/node/x3d-core/metadata_integer.h branches/0.18/src/node/x3d-core/metadata_set.cpp branches/0.18/src/node/x3d-core/metadata_set.h branches/0.18/src/node/x3d-core/metadata_string.cpp branches/0.18/src/node/x3d-core/metadata_string.h branches/0.18/src/node/x3d-core/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/espdu_transform.cpp branches/0.18/src/node/x3d-dis/espdu_transform.h branches/0.18/src/node/x3d-dis/receiver_pdu.cpp branches/0.18/src/node/x3d-dis/receiver_pdu.h branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/signal_pdu.cpp branches/0.18/src/node/x3d-dis/signal_pdu.h branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp branches/0.18/src/node/x3d-dis/transmitter_pdu.h branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.h branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp branches/0.18/src/node/x3d-event-utilities/boolean_filter.h branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp branches/0.18/src/node/x3d-event-utilities/integer_trigger.h branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.h branches/0.18/src/node/x3d-geometry2d/arc2d.cpp branches/0.18/src/node/x3d-geometry2d/arc2d.h branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp branches/0.18/src/node/x3d-geometry2d/arc_close2d.h branches/0.18/src/node/x3d-geometry2d/circle2d.cpp branches/0.18/src/node/x3d-geometry2d/circle2d.h branches/0.18/src/node/x3d-geometry2d/disk2d.cpp branches/0.18/src/node/x3d-geometry2d/disk2d.h branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp branches/0.18/src/node/x3d-geometry2d/polyline2d.h branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp branches/0.18/src/node/x3d-geometry2d/polypoint2d.h branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp branches/0.18/src/node/x3d-geometry2d/rectangle2d.h branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp branches/0.18/src/node/x3d-geospatial/geo_coordinate.h branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h branches/0.18/src/node/x3d-geospatial/geo_location.cpp branches/0.18/src/node/x3d-geospatial/geo_location.h branches/0.18/src/node/x3d-geospatial/geo_lod.cpp branches/0.18/src/node/x3d-geospatial/geo_lod.h branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp branches/0.18/src/node/x3d-geospatial/geo_metadata.h branches/0.18/src/node/x3d-geospatial/geo_origin.cpp branches/0.18/src/node/x3d-geospatial/geo_origin.h branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/static_group.cpp branches/0.18/src/node/x3d-grouping/static_group.h branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp branches/0.18/src/node/x3d-h-anim/h_anim_joint.h branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp branches/0.18/src/node/x3d-h-anim/h_anim_segment.h branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp branches/0.18/src/node/x3d-h-anim/h_anim_site.h branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h branches/0.18/src/node/x3d-networking/load_sensor.cpp branches/0.18/src/node/x3d-networking/load_sensor.h branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp branches/0.18/src/node/x3d-nurbs/contour2d.cpp branches/0.18/src/node/x3d-nurbs/contour2d.h branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp branches/0.18/src/node/x3d-nurbs/coordinate_double.h branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve.h branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp branches/0.18/src/node/x3d-nurbs/nurbs_set.h branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/color_rgba.cpp branches/0.18/src/node/x3d-rendering/color_rgba.h branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.h branches/0.18/src/node/x3d-rendering/triangle_set.cpp branches/0.18/src/node/x3d-rendering/triangle_set.h branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/triangle_strip_set.h branches/0.18/src/node/x3d-shape/fill_properties.cpp branches/0.18/src/node/x3d-shape/fill_properties.h branches/0.18/src/node/x3d-shape/line_properties.cpp branches/0.18/src/node/x3d-shape/line_properties.h branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/multi_texture.cpp branches/0.18/src/node/x3d-texturing/multi_texture.h branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp branches/0.18/src/node/x3d-texturing/multi_texture_transform.h branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2010-05-28 15:17:16 UTC (rev 4150) +++ branches/0.18/ChangeLog 2010-05-28 15:19:57 UTC (rev 4151) @@ -1,3 +1,17 @@ +2010-05-28 Braden McDaniel <br...@en...> + + Use jpeg_decompress_struct.out_color_components to determine the + scan line buffer size. This addresses a memory corruption issue + when reading grayscale JPEGs. + + * src/node/vrml97/image_stream_listener.cpp + (openvrml_node_vrml97::image_stream_listener::jpeg_reader::do_read(const + std::vector<unsigned char> &)): Use + jpeg_decompress_struct.out_color_components to determine the scan + line buffer size. This member isn't set until after the call to + jpeg_start_decompress; so move the buffer allocation to the + start_decompress section. + 2010-05-27 Braden McDaniel <br...@en...> FcFini cannot be called safely from library code. Calling it is Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 + /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 Property changes on: branches/0.18/src/mozilla-plugin ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 + /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 Modified: branches/0.18/src/node/vrml97/image_stream_listener.cpp =================================================================== --- branches/0.18/src/node/vrml97/image_stream_listener.cpp 2010-05-28 15:17:16 UTC (rev 4150) +++ branches/0.18/src/node/vrml97/image_stream_listener.cpp 2010-05-28 15:19:57 UTC (rev 4151) @@ -457,16 +457,6 @@ image.comp(this->cinfo_.num_components); image.resize(this->cinfo_.image_width, this->cinfo_.image_height); - const JDIMENSION samples_per_row = - this->cinfo_.output_width * this->cinfo_.num_components; - static const JDIMENSION num_rows = 1; - this->scanlines = - (*this->cinfo_.mem->alloc_sarray)( - reinterpret_cast<j_common_ptr>(&this->cinfo_), - JPOOL_IMAGE, - samples_per_row, - num_rows); - this->decoder_state = jpeg_reader::start_decompress; } case jpeg_reader::start_decompress: @@ -481,6 +471,16 @@ return; // Input suspended. } + const JDIMENSION samples_per_row = + this->cinfo_.output_width * this->cinfo_.out_color_components; + static const JDIMENSION num_rows = 1; + this->scanlines = + (*this->cinfo_.mem->alloc_sarray)( + reinterpret_cast<j_common_ptr>(&this->cinfo_), + JPOOL_IMAGE, + samples_per_row, + num_rows); + this->decoder_state = this->cinfo_.buffered_image ? jpeg_reader::decompress_progressive : jpeg_reader::decompress_sequential; Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 Property changes on: branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 + /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 + /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 + /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 + /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 + /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 + /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 + /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 + /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 + /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 + /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 Property changes on: branches/0.18/src/node/x3d-core/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 + /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 + /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 + /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 + /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148,4150 Property changes on: branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 + /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115... [truncated message content] |
From: <br...@us...> - 2010-05-28 15:17:23
|
Revision: 4150 http://openvrml.svn.sourceforge.net/openvrml/?rev=4150&view=rev Author: braden Date: 2010-05-28 15:17:16 +0000 (Fri, 28 May 2010) Log Message: ----------- Use jpeg_decompress_struct.out_color_components to determine the scan line buffer size. This addresses a memory corruption issue when reading grayscale JPEGs. Modified Paths: -------------- trunk/ChangeLog trunk/src/node/vrml97/image_stream_listener.cpp Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-05-27 16:32:54 UTC (rev 4149) +++ trunk/ChangeLog 2010-05-28 15:17:16 UTC (rev 4150) @@ -1,3 +1,17 @@ +2010-05-28 Braden McDaniel <br...@en...> + + Use jpeg_decompress_struct.out_color_components to determine the + scan line buffer size. This addresses a memory corruption issue + when reading grayscale JPEGs. + + * src/node/vrml97/image_stream_listener.cpp + (openvrml_node_vrml97::image_stream_listener::jpeg_reader::do_read(const + std::vector<unsigned char> &)): Use + jpeg_decompress_struct.out_color_components to determine the scan + line buffer size. This member isn't set until after the call to + jpeg_start_decompress; so move the buffer allocation to the + start_decompress section. + 2010-05-27 Braden McDaniel <br...@en...> FcFini cannot be called safely from library code. Calling it is Modified: trunk/src/node/vrml97/image_stream_listener.cpp =================================================================== --- trunk/src/node/vrml97/image_stream_listener.cpp 2010-05-27 16:32:54 UTC (rev 4149) +++ trunk/src/node/vrml97/image_stream_listener.cpp 2010-05-28 15:17:16 UTC (rev 4150) @@ -458,16 +458,6 @@ image.comp(this->cinfo_.num_components); image.resize(this->cinfo_.image_width, this->cinfo_.image_height); - const JDIMENSION samples_per_row = - this->cinfo_.output_width * this->cinfo_.num_components; - static const JDIMENSION num_rows = 1; - this->scanlines = - (*this->cinfo_.mem->alloc_sarray)( - reinterpret_cast<j_common_ptr>(&this->cinfo_), - JPOOL_IMAGE, - samples_per_row, - num_rows); - this->decoder_state = jpeg_reader::start_decompress; } case jpeg_reader::start_decompress: @@ -482,6 +472,16 @@ return; // Input suspended. } + const JDIMENSION samples_per_row = + this->cinfo_.output_width * this->cinfo_.out_color_components; + static const JDIMENSION num_rows = 1; + this->scanlines = + (*this->cinfo_.mem->alloc_sarray)( + reinterpret_cast<j_common_ptr>(&this->cinfo_), + JPOOL_IMAGE, + samples_per_row, + num_rows); + this->decoder_state = this->cinfo_.buffered_image ? jpeg_reader::decompress_progressive : jpeg_reader::decompress_sequential; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2010-05-27 16:33:02
|
Revision: 4149 http://openvrml.svn.sourceforge.net/openvrml/?rev=4149&view=rev Author: braden Date: 2010-05-27 16:32:54 +0000 (Thu, 27 May 2010) Log Message: ----------- FcFini cannot be called safely from library code. Calling it is not a strict requirement; though it does clean up valgrind results. To this end, call it from sdl-viewer instead. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/examples/Makefile.am branches/0.18/examples/sdl_viewer.cpp branches/0.18/src/node/vrml97/text.cpp Property Changed: ---------------- branches/0.18/ branches/0.18/src/libopenvrml/openvrml/bad_url.cpp branches/0.18/src/libopenvrml/openvrml/bad_url.h branches/0.18/src/libopenvrml/openvrml/local/proto.cpp branches/0.18/src/libopenvrml/openvrml/local/proto.h branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/libopenvrml/openvrml/scene.h branches/0.18/src/libopenvrml/openvrml/script.cpp branches/0.18/src/mozilla-plugin/ branches/0.18/src/node/vrml97/register_node_metatypes.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.h branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp branches/0.18/src/node/x3d-core/metadata_double.cpp branches/0.18/src/node/x3d-core/metadata_double.h branches/0.18/src/node/x3d-core/metadata_float.cpp branches/0.18/src/node/x3d-core/metadata_float.h branches/0.18/src/node/x3d-core/metadata_integer.cpp branches/0.18/src/node/x3d-core/metadata_integer.h branches/0.18/src/node/x3d-core/metadata_set.cpp branches/0.18/src/node/x3d-core/metadata_set.h branches/0.18/src/node/x3d-core/metadata_string.cpp branches/0.18/src/node/x3d-core/metadata_string.h branches/0.18/src/node/x3d-core/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/espdu_transform.cpp branches/0.18/src/node/x3d-dis/espdu_transform.h branches/0.18/src/node/x3d-dis/receiver_pdu.cpp branches/0.18/src/node/x3d-dis/receiver_pdu.h branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/signal_pdu.cpp branches/0.18/src/node/x3d-dis/signal_pdu.h branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp branches/0.18/src/node/x3d-dis/transmitter_pdu.h branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.h branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp branches/0.18/src/node/x3d-event-utilities/boolean_filter.h branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp branches/0.18/src/node/x3d-event-utilities/integer_trigger.h branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.h branches/0.18/src/node/x3d-geometry2d/arc2d.cpp branches/0.18/src/node/x3d-geometry2d/arc2d.h branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp branches/0.18/src/node/x3d-geometry2d/arc_close2d.h branches/0.18/src/node/x3d-geometry2d/circle2d.cpp branches/0.18/src/node/x3d-geometry2d/circle2d.h branches/0.18/src/node/x3d-geometry2d/disk2d.cpp branches/0.18/src/node/x3d-geometry2d/disk2d.h branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp branches/0.18/src/node/x3d-geometry2d/polyline2d.h branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp branches/0.18/src/node/x3d-geometry2d/polypoint2d.h branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp branches/0.18/src/node/x3d-geometry2d/rectangle2d.h branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp branches/0.18/src/node/x3d-geospatial/geo_coordinate.h branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h branches/0.18/src/node/x3d-geospatial/geo_location.cpp branches/0.18/src/node/x3d-geospatial/geo_location.h branches/0.18/src/node/x3d-geospatial/geo_lod.cpp branches/0.18/src/node/x3d-geospatial/geo_lod.h branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp branches/0.18/src/node/x3d-geospatial/geo_metadata.h branches/0.18/src/node/x3d-geospatial/geo_origin.cpp branches/0.18/src/node/x3d-geospatial/geo_origin.h branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/static_group.cpp branches/0.18/src/node/x3d-grouping/static_group.h branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp branches/0.18/src/node/x3d-h-anim/h_anim_joint.h branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp branches/0.18/src/node/x3d-h-anim/h_anim_segment.h branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp branches/0.18/src/node/x3d-h-anim/h_anim_site.h branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h branches/0.18/src/node/x3d-networking/load_sensor.cpp branches/0.18/src/node/x3d-networking/load_sensor.h branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp branches/0.18/src/node/x3d-nurbs/contour2d.cpp branches/0.18/src/node/x3d-nurbs/contour2d.h branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp branches/0.18/src/node/x3d-nurbs/coordinate_double.h branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve.h branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp branches/0.18/src/node/x3d-nurbs/nurbs_set.h branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/color_rgba.cpp branches/0.18/src/node/x3d-rendering/color_rgba.h branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.h branches/0.18/src/node/x3d-rendering/triangle_set.cpp branches/0.18/src/node/x3d-rendering/triangle_set.h branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/triangle_strip_set.h branches/0.18/src/node/x3d-shape/fill_properties.cpp branches/0.18/src/node/x3d-shape/fill_properties.h branches/0.18/src/node/x3d-shape/line_properties.cpp branches/0.18/src/node/x3d-shape/line_properties.h branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/multi_texture.cpp branches/0.18/src/node/x3d-texturing/multi_texture.h branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp branches/0.18/src/node/x3d-texturing/multi_texture_transform.h branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2010-05-27 16:30:02 UTC (rev 4148) +++ branches/0.18/ChangeLog 2010-05-27 16:32:54 UTC (rev 4149) @@ -1,5 +1,23 @@ 2010-05-27 Braden McDaniel <br...@en...> + FcFini cannot be called safely from library code. Calling it is + not a strict requirement; though it does clean up valgrind + results. To this end, call it from sdl-viewer instead. + + * examples/Makefile.am + (sdl_viewer_CXXFLAGS): Add FONTCONFIG_CFLAGS. + (sdl_viewer_LDFLAGS): Add FONTCONFIG_LIBS. + * examples/sdl_viewer.cpp + (main(int, char *[])): Call FcFini on shutdown if built with + OPENVRML_ENABLE_RENDER_TEXT_NODE. + * src/node/vrml97/text.cpp + (openvrml_node_vrml97::text_metatype::text_metatype(openvrml::browser&)): + It's safe to call FcInit redundantly. + (openvrml_node_vrml97::text_metatype::~text_metatype()): Don't + call FcFini from library code. + +2010-05-27 Braden McDaniel <br...@en...> + Call FcInit/FcFini to clean up resources used by Fontconfig. * src/node/vrml97/text.cpp Modified: branches/0.18/examples/Makefile.am =================================================================== --- branches/0.18/examples/Makefile.am 2010-05-27 16:30:02 UTC (rev 4148) +++ branches/0.18/examples/Makefile.am 2010-05-27 16:32:54 UTC (rev 4149) @@ -19,8 +19,8 @@ -I$(top_srcdir)/src/libopenvrml \ -I$(top_builddir)/src/libopenvrml-gl \ -I$(top_srcdir)/src/libopenvrml-gl -sdl_viewer_CXXFLAGS = $(SDL_CFLAGS) -sdl_viewer_LDFLAGS = $(SDL_LIBS) $(GLU_LIBS) +sdl_viewer_CXXFLAGS = $(SDL_CFLAGS) $(FONTCONFIG_CFLAGS) +sdl_viewer_LDFLAGS = $(SDL_LIBS) $(GLU_LIBS) $(FONTCONFIG_LIBS) sdl_viewer_LDADD = $(top_builddir)/src/libopenvrml-gl/libopenvrml-gl.la pretty_print_SOURCES = pretty_print.cpp Modified: branches/0.18/examples/sdl_viewer.cpp =================================================================== --- branches/0.18/examples/sdl_viewer.cpp 2010-05-27 16:30:02 UTC (rev 4148) +++ branches/0.18/examples/sdl_viewer.cpp 2010-05-27 16:32:54 UTC (rev 4149) @@ -31,6 +31,8 @@ # include <openvrml/gl/viewer.h> # ifdef _WIN32 # include <windows.h> +# elif defined(OPENVRML_ENABLE_RENDER_TEXT_NODE) +# include <fontconfig/fontconfig.h> # endif extern "C" Uint32 update_timer_callback(Uint32 interval, void * param); @@ -115,6 +117,16 @@ return EXIT_FAILURE; } +# if defined(OPENVRML_ENABLE_RENDER_TEXT_NODE) && !defined(_WIN32) + // + // Most applications can ignore this part. FcFini cleans up Fontconfig + // resources that valgrind would otherwise report as leaks. Calling it is + // not a strict requirement; but note that it must be called at most once + // by an application. + // + FcFini(); +# endif + # ifdef _WIN32 fclose(out); FreeConsole(); Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 + /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 Property changes on: branches/0.18/src/mozilla-plugin ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 + /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 Modified: branches/0.18/src/node/vrml97/text.cpp =================================================================== --- branches/0.18/src/node/vrml97/text.cpp 2010-05-27 16:30:02 UTC (rev 4148) +++ branches/0.18/src/node/vrml97/text.cpp 2010-05-27 16:32:54 UTC (rev 4149) @@ -2749,15 +2749,6 @@ * @see http://freetype.org/freetype2/docs/reference/ft2-base_interface.html#FT_Library */ -namespace { - // - // We need to call FcFini once (and only once) when we're finished with - // the library (i.e., shutdown). - // - OPENVRML_LOCAL size_t fc_use_count = 0; - OPENVRML_LOCAL boost::mutex fc_use_count_mutex; -} - /** * @brief Construct. * @@ -2768,17 +2759,9 @@ node_metatype(text_metatype::id, browser) { # ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE - { - using boost::mutex; - using boost::unique_lock; - - unique_lock<mutex> lock(fc_use_count_mutex); - if (fc_use_count++ == 0) { - FcBool fc_succeeded = FcInit(); - if (!fc_succeeded) { - browser.err("error initializing fontconfig library"); - } - } + FcBool fc_succeeded = FcInit(); + if (!fc_succeeded) { + browser.err("error initializing fontconfig library"); } FT_Error ft_error = 0; @@ -2799,12 +2782,6 @@ if (ft_error) { this->browser().err("error shutting down FreeType library"); } - - using boost::mutex; - using boost::unique_lock; - - unique_lock<mutex> lock(fc_use_count_mutex); - if (--fc_use_count == 0) { FcFini(); } # endif // OPENVRML_ENABLE_RENDER_TEXT_NODE } Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 Property changes on: branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 + /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 + /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 + /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 + /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 + /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 + /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 + /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 + /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 + /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 + /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 Property changes on: branches/0.18/src/node/x3d-core/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 + /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 + /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 + /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145,4147-4148 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 + /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,... [truncated message content] |
From: <br...@us...> - 2010-05-27 16:30:11
|
Revision: 4148 http://openvrml.svn.sourceforge.net/openvrml/?rev=4148&view=rev Author: braden Date: 2010-05-27 16:30:02 +0000 (Thu, 27 May 2010) Log Message: ----------- Added comment describing FcFini usage. Modified Paths: -------------- trunk/examples/sdl_viewer.cpp Modified: trunk/examples/sdl_viewer.cpp =================================================================== --- trunk/examples/sdl_viewer.cpp 2010-05-27 16:25:37 UTC (rev 4147) +++ trunk/examples/sdl_viewer.cpp 2010-05-27 16:30:02 UTC (rev 4148) @@ -118,6 +118,12 @@ } # if defined(OPENVRML_ENABLE_RENDER_TEXT_NODE) && !defined(_WIN32) + // + // Most applications can ignore this part. FcFini cleans up Fontconfig + // resources that valgrind would otherwise report as leaks. Calling it is + // not a strict requirement; but note that it must be called at most once + // by an application. + // FcFini(); # endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2010-05-27 16:25:44
|
Revision: 4147 http://openvrml.svn.sourceforge.net/openvrml/?rev=4147&view=rev Author: braden Date: 2010-05-27 16:25:37 +0000 (Thu, 27 May 2010) Log Message: ----------- FcFini cannot be called safely from library code. Calling it is not a strict requirement; though it does clean up valgrind results. To this end, call it from sdl-viewer instead. Modified Paths: -------------- trunk/ChangeLog trunk/examples/Makefile.am trunk/examples/sdl_viewer.cpp trunk/src/node/vrml97/text.cpp Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-05-27 14:53:03 UTC (rev 4146) +++ trunk/ChangeLog 2010-05-27 16:25:37 UTC (rev 4147) @@ -1,5 +1,23 @@ 2010-05-27 Braden McDaniel <br...@en...> + FcFini cannot be called safely from library code. Calling it is + not a strict requirement; though it does clean up valgrind + results. To this end, call it from sdl-viewer instead. + + * examples/Makefile.am + (sdl_viewer_CXXFLAGS): Add FONTCONFIG_CFLAGS. + (sdl_viewer_LDFLAGS): Add FONTCONFIG_LIBS. + * examples/sdl_viewer.cpp + (main(int, char *[])): Call FcFini on shutdown if built with + OPENVRML_ENABLE_RENDER_TEXT_NODE. + * src/node/vrml97/text.cpp + (openvrml_node_vrml97::text_metatype::text_metatype(openvrml::browser&)): + It's safe to call FcInit redundantly. + (openvrml_node_vrml97::text_metatype::~text_metatype()): Don't + call FcFini from library code. + +2010-05-27 Braden McDaniel <br...@en...> + Call FcInit/FcFini to clean up resources used by Fontconfig. * src/node/vrml97/text.cpp Modified: trunk/examples/Makefile.am =================================================================== --- trunk/examples/Makefile.am 2010-05-27 14:53:03 UTC (rev 4146) +++ trunk/examples/Makefile.am 2010-05-27 16:25:37 UTC (rev 4147) @@ -19,8 +19,8 @@ -I$(top_srcdir)/src/libopenvrml \ -I$(top_builddir)/src/libopenvrml-gl \ -I$(top_srcdir)/src/libopenvrml-gl -sdl_viewer_CXXFLAGS = $(SDL_CFLAGS) -sdl_viewer_LDFLAGS = $(SDL_LIBS) $(GLU_LIBS) +sdl_viewer_CXXFLAGS = $(SDL_CFLAGS) $(FONTCONFIG_CFLAGS) +sdl_viewer_LDFLAGS = $(SDL_LIBS) $(GLU_LIBS) $(FONTCONFIG_LIBS) sdl_viewer_LDADD = $(top_builddir)/src/libopenvrml-gl/libopenvrml-gl.la pretty_print_SOURCES = pretty_print.cpp Modified: trunk/examples/sdl_viewer.cpp =================================================================== --- trunk/examples/sdl_viewer.cpp 2010-05-27 14:53:03 UTC (rev 4146) +++ trunk/examples/sdl_viewer.cpp 2010-05-27 16:25:37 UTC (rev 4147) @@ -31,6 +31,8 @@ # include <openvrml/gl/viewer.h> # ifdef _WIN32 # include <windows.h> +# elif defined(OPENVRML_ENABLE_RENDER_TEXT_NODE) +# include <fontconfig/fontconfig.h> # endif extern "C" Uint32 update_timer_callback(Uint32 interval, void * param); @@ -115,6 +117,10 @@ return EXIT_FAILURE; } +# if defined(OPENVRML_ENABLE_RENDER_TEXT_NODE) && !defined(_WIN32) + FcFini(); +# endif + # ifdef _WIN32 fclose(out); FreeConsole(); Modified: trunk/src/node/vrml97/text.cpp =================================================================== --- trunk/src/node/vrml97/text.cpp 2010-05-27 14:53:03 UTC (rev 4146) +++ trunk/src/node/vrml97/text.cpp 2010-05-27 16:25:37 UTC (rev 4147) @@ -2752,15 +2752,6 @@ * @see http://freetype.org/freetype2/docs/reference/ft2-base_interface.html#FT_Library */ -namespace { - // - // We need to call FcFini once (and only once) when we're finished with - // the library (i.e., shutdown). - // - OPENVRML_LOCAL size_t fc_use_count = 0; - OPENVRML_LOCAL boost::mutex fc_use_count_mutex; -} - /** * @brief Construct. * @@ -2771,17 +2762,9 @@ node_metatype(text_metatype::id, browser) { # ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE - { - using boost::mutex; - using boost::unique_lock; - - unique_lock<mutex> lock(fc_use_count_mutex); - if (fc_use_count++ == 0) { - FcBool fc_succeeded = FcInit(); - if (!fc_succeeded) { - browser.err("error initializing fontconfig library"); - } - } + FcBool fc_succeeded = FcInit(); + if (!fc_succeeded) { + browser.err("error initializing fontconfig library"); } FT_Error ft_error = 0; @@ -2802,12 +2785,6 @@ if (ft_error) { this->browser().err("error shutting down FreeType library"); } - - using boost::mutex; - using boost::unique_lock; - - unique_lock<mutex> lock(fc_use_count_mutex); - if (--fc_use_count == 0) { FcFini(); } # endif // OPENVRML_ENABLE_RENDER_TEXT_NODE } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2010-05-27 14:53:12
|
Revision: 4146 http://openvrml.svn.sourceforge.net/openvrml/?rev=4146&view=rev Author: braden Date: 2010-05-27 14:53:03 +0000 (Thu, 27 May 2010) Log Message: ----------- Call FcInit/FcFini to clean up resources used by Fontconfig. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/src/node/vrml97/text.cpp Property Changed: ---------------- branches/0.18/ branches/0.18/src/libopenvrml/openvrml/bad_url.cpp branches/0.18/src/libopenvrml/openvrml/bad_url.h branches/0.18/src/libopenvrml/openvrml/local/proto.cpp branches/0.18/src/libopenvrml/openvrml/local/proto.h branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/libopenvrml/openvrml/scene.h branches/0.18/src/libopenvrml/openvrml/script.cpp branches/0.18/src/mozilla-plugin/ branches/0.18/src/node/vrml97/register_node_metatypes.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.h branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp branches/0.18/src/node/x3d-core/metadata_double.cpp branches/0.18/src/node/x3d-core/metadata_double.h branches/0.18/src/node/x3d-core/metadata_float.cpp branches/0.18/src/node/x3d-core/metadata_float.h branches/0.18/src/node/x3d-core/metadata_integer.cpp branches/0.18/src/node/x3d-core/metadata_integer.h branches/0.18/src/node/x3d-core/metadata_set.cpp branches/0.18/src/node/x3d-core/metadata_set.h branches/0.18/src/node/x3d-core/metadata_string.cpp branches/0.18/src/node/x3d-core/metadata_string.h branches/0.18/src/node/x3d-core/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/espdu_transform.cpp branches/0.18/src/node/x3d-dis/espdu_transform.h branches/0.18/src/node/x3d-dis/receiver_pdu.cpp branches/0.18/src/node/x3d-dis/receiver_pdu.h branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/signal_pdu.cpp branches/0.18/src/node/x3d-dis/signal_pdu.h branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp branches/0.18/src/node/x3d-dis/transmitter_pdu.h branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.h branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp branches/0.18/src/node/x3d-event-utilities/boolean_filter.h branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp branches/0.18/src/node/x3d-event-utilities/integer_trigger.h branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.h branches/0.18/src/node/x3d-geometry2d/arc2d.cpp branches/0.18/src/node/x3d-geometry2d/arc2d.h branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp branches/0.18/src/node/x3d-geometry2d/arc_close2d.h branches/0.18/src/node/x3d-geometry2d/circle2d.cpp branches/0.18/src/node/x3d-geometry2d/circle2d.h branches/0.18/src/node/x3d-geometry2d/disk2d.cpp branches/0.18/src/node/x3d-geometry2d/disk2d.h branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp branches/0.18/src/node/x3d-geometry2d/polyline2d.h branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp branches/0.18/src/node/x3d-geometry2d/polypoint2d.h branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp branches/0.18/src/node/x3d-geometry2d/rectangle2d.h branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp branches/0.18/src/node/x3d-geospatial/geo_coordinate.h branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h branches/0.18/src/node/x3d-geospatial/geo_location.cpp branches/0.18/src/node/x3d-geospatial/geo_location.h branches/0.18/src/node/x3d-geospatial/geo_lod.cpp branches/0.18/src/node/x3d-geospatial/geo_lod.h branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp branches/0.18/src/node/x3d-geospatial/geo_metadata.h branches/0.18/src/node/x3d-geospatial/geo_origin.cpp branches/0.18/src/node/x3d-geospatial/geo_origin.h branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/static_group.cpp branches/0.18/src/node/x3d-grouping/static_group.h branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp branches/0.18/src/node/x3d-h-anim/h_anim_joint.h branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp branches/0.18/src/node/x3d-h-anim/h_anim_segment.h branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp branches/0.18/src/node/x3d-h-anim/h_anim_site.h branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h branches/0.18/src/node/x3d-networking/load_sensor.cpp branches/0.18/src/node/x3d-networking/load_sensor.h branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp branches/0.18/src/node/x3d-nurbs/contour2d.cpp branches/0.18/src/node/x3d-nurbs/contour2d.h branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp branches/0.18/src/node/x3d-nurbs/coordinate_double.h branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve.h branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp branches/0.18/src/node/x3d-nurbs/nurbs_set.h branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/color_rgba.cpp branches/0.18/src/node/x3d-rendering/color_rgba.h branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.h branches/0.18/src/node/x3d-rendering/triangle_set.cpp branches/0.18/src/node/x3d-rendering/triangle_set.h branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/triangle_strip_set.h branches/0.18/src/node/x3d-shape/fill_properties.cpp branches/0.18/src/node/x3d-shape/fill_properties.h branches/0.18/src/node/x3d-shape/line_properties.cpp branches/0.18/src/node/x3d-shape/line_properties.h branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/multi_texture.cpp branches/0.18/src/node/x3d-texturing/multi_texture.h branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp branches/0.18/src/node/x3d-texturing/multi_texture_transform.h branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2010-05-27 14:49:47 UTC (rev 4145) +++ branches/0.18/ChangeLog 2010-05-27 14:53:03 UTC (rev 4146) @@ -1,3 +1,18 @@ +2010-05-27 Braden McDaniel <br...@en...> + + Call FcInit/FcFini to clean up resources used by Fontconfig. + + * src/node/vrml97/text.cpp + (text_node::text_geometry::text_geometry(const + boost::ptr_vector<line_geometry> &, const std::string &, const + std::string &, bool, float, float, float)): Initialize x_min_, + x_max_, y_min_, and y_max_ to 0. + (openvrml_node_vrml97::text_metatype::text_metatype(openvrml::browser&)): + Call FcInit if this is the first time we're using the Fontconfig + library. + (openvrml_node_vrml97::text_metatype::~text_metatype()): Call + FcFini if this is the last use of the Fontconfig library. + 2010-05-21 Braden McDaniel <br...@en...> We're expanding the pixels that libpng reads to full RGBA Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 + /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 Property changes on: branches/0.18/src/mozilla-plugin ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 + /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 Modified: branches/0.18/src/node/vrml97/text.cpp =================================================================== --- branches/0.18/src/node/vrml97/text.cpp 2010-05-27 14:49:47 UTC (rev 4145) +++ branches/0.18/src/node/vrml97/text.cpp 2010-05-27 14:53:03 UTC (rev 4146) @@ -1647,7 +1647,11 @@ const float size, const float spacing, const float max_extent) - OPENVRML_THROW1(std::bad_alloc) + OPENVRML_THROW1(std::bad_alloc): + x_min_(0), + x_max_(0), + y_min_(0), + y_max_(0) { std::size_t polygons = 0; for (boost::ptr_vector<line_geometry>::const_iterator line = @@ -2745,6 +2749,15 @@ * @see http://freetype.org/freetype2/docs/reference/ft2-base_interface.html#FT_Library */ +namespace { + // + // We need to call FcFini once (and only once) when we're finished with + // the library (i.e., shutdown). + // + OPENVRML_LOCAL size_t fc_use_count = 0; + OPENVRML_LOCAL boost::mutex fc_use_count_mutex; +} + /** * @brief Construct. * @@ -2755,9 +2768,22 @@ node_metatype(text_metatype::id, browser) { # ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE - FT_Error error = 0; - error = FT_Init_FreeType(&this->freeTypeLibrary); - if (error) { + { + using boost::mutex; + using boost::unique_lock; + + unique_lock<mutex> lock(fc_use_count_mutex); + if (fc_use_count++ == 0) { + FcBool fc_succeeded = FcInit(); + if (!fc_succeeded) { + browser.err("error initializing fontconfig library"); + } + } + } + + FT_Error ft_error = 0; + ft_error = FT_Init_FreeType(&this->freeTypeLibrary); + if (ft_error) { browser.err("error initializing FreeType library"); } # endif // OPENVRML_ENABLE_RENDER_TEXT_NODE @@ -2769,11 +2795,16 @@ openvrml_node_vrml97::text_metatype::~text_metatype() OPENVRML_NOTHROW { # ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE - FT_Error error = 0; - error = FT_Done_FreeType(this->freeTypeLibrary); - if (error) { + FT_Error ft_error = FT_Done_FreeType(this->freeTypeLibrary); + if (ft_error) { this->browser().err("error shutting down FreeType library"); } + + using boost::mutex; + using boost::unique_lock; + + unique_lock<mutex> lock(fc_use_count_mutex); + if (--fc_use_count == 0) { FcFini(); } # endif // OPENVRML_ENABLE_RENDER_TEXT_NODE } Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 Property changes on: branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 + /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 + /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 + /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 + /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 + /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 + /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 + /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 + /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 + /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 + /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 Property changes on: branches/0.18/src/node/x3d-core/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 + /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 + /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 + /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 + /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 Property changes on: branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 + /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143,4145 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.cpp ___... [truncated message content] |
From: <br...@us...> - 2010-05-27 14:49:57
|
Revision: 4145 http://openvrml.svn.sourceforge.net/openvrml/?rev=4145&view=rev Author: braden Date: 2010-05-27 14:49:47 +0000 (Thu, 27 May 2010) Log Message: ----------- Call FcInit/FcFini to clean up resources used by Fontconfig. Modified Paths: -------------- trunk/ChangeLog trunk/src/node/vrml97/text.cpp Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-05-21 09:08:10 UTC (rev 4144) +++ trunk/ChangeLog 2010-05-27 14:49:47 UTC (rev 4145) @@ -1,3 +1,18 @@ +2010-05-27 Braden McDaniel <br...@en...> + + Call FcInit/FcFini to clean up resources used by Fontconfig. + + * src/node/vrml97/text.cpp + (text_node::text_geometry::text_geometry(const + boost::ptr_vector<line_geometry> &, const std::string &, const + std::string &, bool, float, float, float)): Initialize x_min_, + x_max_, y_min_, and y_max_ to 0. + (openvrml_node_vrml97::text_metatype::text_metatype(openvrml::browser&)): + Call FcInit if this is the first time we're using the Fontconfig + library. + (openvrml_node_vrml97::text_metatype::~text_metatype()): Call + FcFini if this is the last use of the Fontconfig library. + 2010-05-21 Braden McDaniel <br...@en...> We're expanding the pixels that libpng reads to full RGBA Modified: trunk/src/node/vrml97/text.cpp =================================================================== --- trunk/src/node/vrml97/text.cpp 2010-05-21 09:08:10 UTC (rev 4144) +++ trunk/src/node/vrml97/text.cpp 2010-05-27 14:49:47 UTC (rev 4145) @@ -1649,7 +1649,11 @@ const float size, const float spacing, const float max_extent) - OPENVRML_THROW1(std::bad_alloc) + OPENVRML_THROW1(std::bad_alloc): + x_min_(0), + x_max_(0), + y_min_(0), + y_max_(0) { std::size_t polygons = 0; for (boost::ptr_vector<line_geometry>::const_iterator line = @@ -2748,6 +2752,15 @@ * @see http://freetype.org/freetype2/docs/reference/ft2-base_interface.html#FT_Library */ +namespace { + // + // We need to call FcFini once (and only once) when we're finished with + // the library (i.e., shutdown). + // + OPENVRML_LOCAL size_t fc_use_count = 0; + OPENVRML_LOCAL boost::mutex fc_use_count_mutex; +} + /** * @brief Construct. * @@ -2758,9 +2771,22 @@ node_metatype(text_metatype::id, browser) { # ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE - FT_Error error = 0; - error = FT_Init_FreeType(&this->freeTypeLibrary); - if (error) { + { + using boost::mutex; + using boost::unique_lock; + + unique_lock<mutex> lock(fc_use_count_mutex); + if (fc_use_count++ == 0) { + FcBool fc_succeeded = FcInit(); + if (!fc_succeeded) { + browser.err("error initializing fontconfig library"); + } + } + } + + FT_Error ft_error = 0; + ft_error = FT_Init_FreeType(&this->freeTypeLibrary); + if (ft_error) { browser.err("error initializing FreeType library"); } # endif // OPENVRML_ENABLE_RENDER_TEXT_NODE @@ -2772,11 +2798,16 @@ openvrml_node_vrml97::text_metatype::~text_metatype() OPENVRML_NOTHROW { # ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE - FT_Error error = 0; - error = FT_Done_FreeType(this->freeTypeLibrary); - if (error) { + FT_Error ft_error = FT_Done_FreeType(this->freeTypeLibrary); + if (ft_error) { this->browser().err("error shutting down FreeType library"); } + + using boost::mutex; + using boost::unique_lock; + + unique_lock<mutex> lock(fc_use_count_mutex); + if (--fc_use_count == 0) { FcFini(); } # endif // OPENVRML_ENABLE_RENDER_TEXT_NODE } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2010-05-21 09:08:19
|
Revision: 4144 http://openvrml.svn.sourceforge.net/openvrml/?rev=4144&view=rev Author: braden Date: 2010-05-21 09:08:10 +0000 (Fri, 21 May 2010) Log Message: ----------- We're expanding the pixels that libpng reads to full RGBA quartets; so when reading pixels, the new_row and old_row buffers must be sized accordingly. This fixes a memory corruption issue. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/src/node/vrml97/image_stream_listener.cpp Property Changed: ---------------- branches/0.18/ branches/0.18/src/libopenvrml/openvrml/bad_url.cpp branches/0.18/src/libopenvrml/openvrml/bad_url.h branches/0.18/src/libopenvrml/openvrml/local/proto.cpp branches/0.18/src/libopenvrml/openvrml/local/proto.h branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/libopenvrml/openvrml/scene.h branches/0.18/src/libopenvrml/openvrml/script.cpp branches/0.18/src/mozilla-plugin/ branches/0.18/src/node/vrml97/register_node_metatypes.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.h branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp branches/0.18/src/node/x3d-core/metadata_double.cpp branches/0.18/src/node/x3d-core/metadata_double.h branches/0.18/src/node/x3d-core/metadata_float.cpp branches/0.18/src/node/x3d-core/metadata_float.h branches/0.18/src/node/x3d-core/metadata_integer.cpp branches/0.18/src/node/x3d-core/metadata_integer.h branches/0.18/src/node/x3d-core/metadata_set.cpp branches/0.18/src/node/x3d-core/metadata_set.h branches/0.18/src/node/x3d-core/metadata_string.cpp branches/0.18/src/node/x3d-core/metadata_string.h branches/0.18/src/node/x3d-core/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/espdu_transform.cpp branches/0.18/src/node/x3d-dis/espdu_transform.h branches/0.18/src/node/x3d-dis/receiver_pdu.cpp branches/0.18/src/node/x3d-dis/receiver_pdu.h branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/signal_pdu.cpp branches/0.18/src/node/x3d-dis/signal_pdu.h branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp branches/0.18/src/node/x3d-dis/transmitter_pdu.h branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.h branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp branches/0.18/src/node/x3d-event-utilities/boolean_filter.h branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp branches/0.18/src/node/x3d-event-utilities/integer_trigger.h branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.h branches/0.18/src/node/x3d-geometry2d/arc2d.cpp branches/0.18/src/node/x3d-geometry2d/arc2d.h branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp branches/0.18/src/node/x3d-geometry2d/arc_close2d.h branches/0.18/src/node/x3d-geometry2d/circle2d.cpp branches/0.18/src/node/x3d-geometry2d/circle2d.h branches/0.18/src/node/x3d-geometry2d/disk2d.cpp branches/0.18/src/node/x3d-geometry2d/disk2d.h branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp branches/0.18/src/node/x3d-geometry2d/polyline2d.h branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp branches/0.18/src/node/x3d-geometry2d/polypoint2d.h branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp branches/0.18/src/node/x3d-geometry2d/rectangle2d.h branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp branches/0.18/src/node/x3d-geospatial/geo_coordinate.h branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h branches/0.18/src/node/x3d-geospatial/geo_location.cpp branches/0.18/src/node/x3d-geospatial/geo_location.h branches/0.18/src/node/x3d-geospatial/geo_lod.cpp branches/0.18/src/node/x3d-geospatial/geo_lod.h branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp branches/0.18/src/node/x3d-geospatial/geo_metadata.h branches/0.18/src/node/x3d-geospatial/geo_origin.cpp branches/0.18/src/node/x3d-geospatial/geo_origin.h branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/static_group.cpp branches/0.18/src/node/x3d-grouping/static_group.h branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp branches/0.18/src/node/x3d-h-anim/h_anim_joint.h branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp branches/0.18/src/node/x3d-h-anim/h_anim_segment.h branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp branches/0.18/src/node/x3d-h-anim/h_anim_site.h branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h branches/0.18/src/node/x3d-networking/load_sensor.cpp branches/0.18/src/node/x3d-networking/load_sensor.h branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp branches/0.18/src/node/x3d-nurbs/contour2d.cpp branches/0.18/src/node/x3d-nurbs/contour2d.h branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp branches/0.18/src/node/x3d-nurbs/coordinate_double.h branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve.h branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp branches/0.18/src/node/x3d-nurbs/nurbs_set.h branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/color_rgba.cpp branches/0.18/src/node/x3d-rendering/color_rgba.h branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.h branches/0.18/src/node/x3d-rendering/triangle_set.cpp branches/0.18/src/node/x3d-rendering/triangle_set.h branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/triangle_strip_set.h branches/0.18/src/node/x3d-shape/fill_properties.cpp branches/0.18/src/node/x3d-shape/fill_properties.h branches/0.18/src/node/x3d-shape/line_properties.cpp branches/0.18/src/node/x3d-shape/line_properties.h branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/multi_texture.cpp branches/0.18/src/node/x3d-texturing/multi_texture.h branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp branches/0.18/src/node/x3d-texturing/multi_texture_transform.h branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2010-05-21 09:05:28 UTC (rev 4143) +++ branches/0.18/ChangeLog 2010-05-21 09:08:10 UTC (rev 4144) @@ -1,3 +1,16 @@ +2010-05-21 Braden McDaniel <br...@en...> + + We're expanding the pixels that libpng reads to full RGBA + quartets; so when reading pixels, the new_row and old_row buffers + must be sized accordingly. This fixes a memory corruption issue. + + * src/node/vrml97/image_stream_listener.cpp + (openvrml_png_info_callback(png_structp, png_infop)): Use + png_ptr->rowbytes to size the old_row buffer. + (openvrml_png_row_callback(png_structp, png_bytep, png_uint_32, + int)): Use png_ptr->rowbytes to get the size of the buffer that + libpng is using. + 2010-05-02 Braden McDaniel <br...@en...> fcfreetype.h is C++-safe in fontconfig >= 2.3.0. It should be Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 + /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 Property changes on: branches/0.18/src/mozilla-plugin ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 + /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 Modified: branches/0.18/src/node/vrml97/image_stream_listener.cpp =================================================================== --- branches/0.18/src/node/vrml97/image_stream_listener.cpp 2010-05-21 09:05:28 UTC (rev 4143) +++ branches/0.18/src/node/vrml97/image_stream_listener.cpp 2010-05-21 09:08:10 UTC (rev 4144) @@ -41,7 +41,6 @@ # ifdef OPENVRML_ENABLE_PNG_TEXTURES void openvrml_png_info_callback(png_structp png_ptr, png_infop info_ptr) { - using boost::shared_lock; using boost::shared_mutex; using boost::unique_lock; @@ -78,18 +77,18 @@ if (color_type == PNG_COLOR_TYPE_PALETTE) { png_set_expand(png_ptr); image.comp(3); + } else { + // + // Expand grayscale images to the full 8 bits from 1, 2, or + // 4 bits/pixel. + // + const png_byte bit_depth = png_get_bit_depth(png_ptr, info_ptr); + if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { + png_set_expand(png_ptr); + } } // - // Expand grayscale images to the full 8 bits from 1, 2, or - // 4 bits/pixel. - // - const png_byte bit_depth = png_get_bit_depth(png_ptr, info_ptr); - if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { - png_set_expand(png_ptr); - } - - // // Expand paletted or RGB images with transparency to full alpha // channels so the data will be available as RGBA quartets. // @@ -137,7 +136,7 @@ png_read_update_info(png_ptr, info_ptr); - reader.old_row.resize(image.comp() * image.x()); + reader.old_row.resize(png_ptr->rowbytes); } void openvrml_png_row_callback(png_structp png_ptr, @@ -159,14 +158,16 @@ openvrml::image & image = reader.stream_listener.image_; - png_progressive_combine_row(png_ptr, &reader.old_row[0], new_row); + assert(!reader.old_row.empty()); + png_progressive_combine_row(png_ptr, &reader.old_row.front(), new_row); + // // openvrml::image pixels start at the bottom left. // const size_t image_row = (image.y() - 1) - row_num; - const size_t bytes_per_row = reader.old_row.size(); - const size_t image_width = bytes_per_row / image.comp(); + const size_t bytes_per_row = png_ptr->rowbytes; + const size_t image_width = png_ptr->width; for (size_t pixel_index = 0, byte_index = 0; pixel_index < image_width; ++pixel_index) { using openvrml::int32; @@ -192,6 +193,8 @@ reader.stream_listener.node_.modified(true); + assert(reader.old_row.size() >= bytes_per_row); + copy(new_row, new_row + bytes_per_row, reader.old_row.begin()); } @@ -228,9 +231,7 @@ openvrml_node_vrml97::image_stream_listener::png_reader::~png_reader() OPENVRML_NOTHROW { - png_destroy_read_struct(&this->png_ptr_, - &this->info_ptr_, - png_infopp(0)); + png_destroy_read_struct(&this->png_ptr_, &this->info_ptr_, png_infopp(0)); } void Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 Property changes on: branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 + /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 + /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 + /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 + /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 + /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 + /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 + /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 + /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 + /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 + /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 Property changes on: branches/0.18/src/node/x3d-core/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 + /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 + /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 + /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 + /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141,4143 Property changes on: branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 + /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,405... [truncated message content] |
From: <br...@us...> - 2010-05-21 09:05:35
|
Revision: 4143 http://openvrml.svn.sourceforge.net/openvrml/?rev=4143&view=rev Author: braden Date: 2010-05-21 09:05:28 +0000 (Fri, 21 May 2010) Log Message: ----------- We're expanding the pixels that libpng reads to full RGBA quartets; so when reading pixels, the new_row and old_row buffers must be sized accordingly. This fixes a memory corruption issue. Modified Paths: -------------- trunk/ChangeLog trunk/src/node/vrml97/image_stream_listener.cpp Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2010-05-03 03:53:16 UTC (rev 4142) +++ trunk/ChangeLog 2010-05-21 09:05:28 UTC (rev 4143) @@ -1,3 +1,16 @@ +2010-05-21 Braden McDaniel <br...@en...> + + We're expanding the pixels that libpng reads to full RGBA + quartets; so when reading pixels, the new_row and old_row buffers + must be sized accordingly. This fixes a memory corruption issue. + + * src/node/vrml97/image_stream_listener.cpp + (openvrml_png_info_callback(png_structp, png_infop)): Use + png_ptr->rowbytes to size the old_row buffer. + (openvrml_png_row_callback(png_structp, png_bytep, png_uint_32, + int)): Use png_ptr->rowbytes to get the size of the buffer that + libpng is using. + 2010-05-02 Braden McDaniel <br...@en...> fcfreetype.h is C++-safe in fontconfig >= 2.3.0. It should be Modified: trunk/src/node/vrml97/image_stream_listener.cpp =================================================================== --- trunk/src/node/vrml97/image_stream_listener.cpp 2010-05-03 03:53:16 UTC (rev 4142) +++ trunk/src/node/vrml97/image_stream_listener.cpp 2010-05-21 09:05:28 UTC (rev 4143) @@ -41,7 +41,6 @@ # ifdef OPENVRML_ENABLE_PNG_TEXTURES void openvrml_png_info_callback(png_structp png_ptr, png_infop info_ptr) { - using boost::shared_lock; using boost::shared_mutex; using boost::unique_lock; @@ -78,18 +77,18 @@ if (color_type == PNG_COLOR_TYPE_PALETTE) { png_set_expand(png_ptr); image.comp(3); + } else { + // + // Expand grayscale images to the full 8 bits from 1, 2, or + // 4 bits/pixel. + // + const png_byte bit_depth = png_get_bit_depth(png_ptr, info_ptr); + if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { + png_set_expand(png_ptr); + } } // - // Expand grayscale images to the full 8 bits from 1, 2, or - // 4 bits/pixel. - // - const png_byte bit_depth = png_get_bit_depth(png_ptr, info_ptr); - if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) { - png_set_expand(png_ptr); - } - - // // Expand paletted or RGB images with transparency to full alpha // channels so the data will be available as RGBA quartets. // @@ -137,7 +136,7 @@ png_read_update_info(png_ptr, info_ptr); - reader.old_row.resize(image.comp() * image.x()); + reader.old_row.resize(png_ptr->rowbytes); } void openvrml_png_row_callback(png_structp png_ptr, @@ -159,14 +158,16 @@ openvrml::image & image = reader.stream_listener.image_; - png_progressive_combine_row(png_ptr, &reader.old_row[0], new_row); + assert(!reader.old_row.empty()); + png_progressive_combine_row(png_ptr, &reader.old_row.front(), new_row); + // // openvrml::image pixels start at the bottom left. // const size_t image_row = (image.y() - 1) - row_num; - const size_t bytes_per_row = reader.old_row.size(); - const size_t image_width = bytes_per_row / image.comp(); + const size_t bytes_per_row = png_ptr->rowbytes; + const size_t image_width = png_ptr->width; for (size_t pixel_index = 0, byte_index = 0; pixel_index < image_width; ++pixel_index) { using openvrml::int32; @@ -192,6 +193,8 @@ reader.stream_listener.node_.modified(true); + assert(reader.old_row.size() >= bytes_per_row); + copy(new_row, new_row + bytes_per_row, reader.old_row.begin()); } @@ -229,9 +232,7 @@ openvrml_node_vrml97::image_stream_listener::png_reader::~png_reader() OPENVRML_NOTHROW { - png_destroy_read_struct(&this->png_ptr_, - &this->info_ptr_, - png_infopp(0)); + png_destroy_read_struct(&this->png_ptr_, &this->info_ptr_, png_infopp(0)); } void This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <br...@us...> - 2010-05-03 03:53:24
|
Revision: 4142 http://openvrml.svn.sourceforge.net/openvrml/?rev=4142&view=rev Author: braden Date: 2010-05-03 03:53:16 +0000 (Mon, 03 May 2010) Log Message: ----------- fcfreetype.h is C++-safe in fontconfig >= 2.3.0. It should be safe to require at least that version. Modified Paths: -------------- branches/0.18/ChangeLog branches/0.18/configure.ac branches/0.18/src/node/vrml97/text.cpp Property Changed: ---------------- branches/0.18/ branches/0.18/src/libopenvrml/openvrml/bad_url.cpp branches/0.18/src/libopenvrml/openvrml/bad_url.h branches/0.18/src/libopenvrml/openvrml/local/proto.cpp branches/0.18/src/libopenvrml/openvrml/local/proto.h branches/0.18/src/libopenvrml/openvrml/scene.cpp branches/0.18/src/libopenvrml/openvrml/scene.h branches/0.18/src/libopenvrml/openvrml/script.cpp branches/0.18/src/mozilla-plugin/ branches/0.18/src/node/vrml97/register_node_metatypes.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp branches/0.18/src/node/x3d-cad-geometry/cad_face.h branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp branches/0.18/src/node/x3d-core/metadata_double.cpp branches/0.18/src/node/x3d-core/metadata_double.h branches/0.18/src/node/x3d-core/metadata_float.cpp branches/0.18/src/node/x3d-core/metadata_float.h branches/0.18/src/node/x3d-core/metadata_integer.cpp branches/0.18/src/node/x3d-core/metadata_integer.h branches/0.18/src/node/x3d-core/metadata_set.cpp branches/0.18/src/node/x3d-core/metadata_set.h branches/0.18/src/node/x3d-core/metadata_string.cpp branches/0.18/src/node/x3d-core/metadata_string.h branches/0.18/src/node/x3d-core/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/espdu_transform.cpp branches/0.18/src/node/x3d-dis/espdu_transform.h branches/0.18/src/node/x3d-dis/receiver_pdu.cpp branches/0.18/src/node/x3d-dis/receiver_pdu.h branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp branches/0.18/src/node/x3d-dis/signal_pdu.cpp branches/0.18/src/node/x3d-dis/signal_pdu.h branches/0.18/src/node/x3d-dis/transmitter_pdu.cpp branches/0.18/src/node/x3d-dis/transmitter_pdu.h branches/0.18/src/node/x3d-environmental-effects/register_node_metatypes.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.cpp branches/0.18/src/node/x3d-environmental-effects/texture_background.h branches/0.18/src/node/x3d-event-utilities/boolean_filter.cpp branches/0.18/src/node/x3d-event-utilities/boolean_filter.h branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/boolean_sequencer.h branches/0.18/src/node/x3d-event-utilities/boolean_toggle.cpp branches/0.18/src/node/x3d-event-utilities/boolean_toggle.h branches/0.18/src/node/x3d-event-utilities/boolean_trigger.cpp branches/0.18/src/node/x3d-event-utilities/boolean_trigger.h branches/0.18/src/node/x3d-event-utilities/integer_sequencer.cpp branches/0.18/src/node/x3d-event-utilities/integer_sequencer.h branches/0.18/src/node/x3d-event-utilities/integer_trigger.cpp branches/0.18/src/node/x3d-event-utilities/integer_trigger.h branches/0.18/src/node/x3d-event-utilities/register_node_metatypes.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.cpp branches/0.18/src/node/x3d-event-utilities/time_trigger.h branches/0.18/src/node/x3d-geometry2d/arc2d.cpp branches/0.18/src/node/x3d-geometry2d/arc2d.h branches/0.18/src/node/x3d-geometry2d/arc_close2d.cpp branches/0.18/src/node/x3d-geometry2d/arc_close2d.h branches/0.18/src/node/x3d-geometry2d/circle2d.cpp branches/0.18/src/node/x3d-geometry2d/circle2d.h branches/0.18/src/node/x3d-geometry2d/disk2d.cpp branches/0.18/src/node/x3d-geometry2d/disk2d.h branches/0.18/src/node/x3d-geometry2d/polyline2d.cpp branches/0.18/src/node/x3d-geometry2d/polyline2d.h branches/0.18/src/node/x3d-geometry2d/polypoint2d.cpp branches/0.18/src/node/x3d-geometry2d/polypoint2d.h branches/0.18/src/node/x3d-geometry2d/rectangle2d.cpp branches/0.18/src/node/x3d-geometry2d/rectangle2d.h branches/0.18/src/node/x3d-geometry2d/register_node_metatypes.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.cpp branches/0.18/src/node/x3d-geometry2d/triangle_set2d.h branches/0.18/src/node/x3d-geospatial/geo_coordinate.cpp branches/0.18/src/node/x3d-geospatial/geo_coordinate.h branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.cpp branches/0.18/src/node/x3d-geospatial/geo_elevation_grid.h branches/0.18/src/node/x3d-geospatial/geo_location.cpp branches/0.18/src/node/x3d-geospatial/geo_location.h branches/0.18/src/node/x3d-geospatial/geo_lod.cpp branches/0.18/src/node/x3d-geospatial/geo_lod.h branches/0.18/src/node/x3d-geospatial/geo_metadata.cpp branches/0.18/src/node/x3d-geospatial/geo_metadata.h branches/0.18/src/node/x3d-geospatial/geo_origin.cpp branches/0.18/src/node/x3d-geospatial/geo_origin.h branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.cpp branches/0.18/src/node/x3d-geospatial/geo_position_interpolator.h branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.cpp branches/0.18/src/node/x3d-geospatial/geo_touch_sensor.h branches/0.18/src/node/x3d-geospatial/geo_viewpoint.cpp branches/0.18/src/node/x3d-geospatial/geo_viewpoint.h branches/0.18/src/node/x3d-geospatial/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/register_node_metatypes.cpp branches/0.18/src/node/x3d-grouping/static_group.cpp branches/0.18/src/node/x3d-grouping/static_group.h branches/0.18/src/node/x3d-h-anim/h_anim_displacer.cpp branches/0.18/src/node/x3d-h-anim/h_anim_displacer.h branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.cpp branches/0.18/src/node/x3d-h-anim/h_anim_humanoid.h branches/0.18/src/node/x3d-h-anim/h_anim_joint.cpp branches/0.18/src/node/x3d-h-anim/h_anim_joint.h branches/0.18/src/node/x3d-h-anim/h_anim_segment.cpp branches/0.18/src/node/x3d-h-anim/h_anim_segment.h branches/0.18/src/node/x3d-h-anim/h_anim_site.cpp branches/0.18/src/node/x3d-h-anim/h_anim_site.h branches/0.18/src/node/x3d-h-anim/register_node_metatypes.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/coordinate_interpolator2d.h branches/0.18/src/node/x3d-interpolation/position_interpolator2d.cpp branches/0.18/src/node/x3d-interpolation/position_interpolator2d.h branches/0.18/src/node/x3d-interpolation/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/key_sensor.h branches/0.18/src/node/x3d-key-device-sensor/register_node_metatypes.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.cpp branches/0.18/src/node/x3d-key-device-sensor/string_sensor.h branches/0.18/src/node/x3d-networking/load_sensor.cpp branches/0.18/src/node/x3d-networking/load_sensor.h branches/0.18/src/node/x3d-networking/register_node_metatypes.cpp branches/0.18/src/node/x3d-nurbs/contour2d.cpp branches/0.18/src/node/x3d-nurbs/contour2d.h branches/0.18/src/node/x3d-nurbs/contour_polyline2d.cpp branches/0.18/src/node/x3d-nurbs/contour_polyline2d.h branches/0.18/src/node/x3d-nurbs/coordinate_double.cpp branches/0.18/src/node/x3d-nurbs/coordinate_double.h branches/0.18/src/node/x3d-nurbs/nurbs_curve.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve.h branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.cpp branches/0.18/src/node/x3d-nurbs/nurbs_curve2d.h branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_orientation_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_patch_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_position_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_set.cpp branches/0.18/src/node/x3d-nurbs/nurbs_set.h branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.cpp branches/0.18/src/node/x3d-nurbs/nurbs_surface_interpolator.h branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swept_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_swung_surface.h branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.cpp branches/0.18/src/node/x3d-nurbs/nurbs_texture_coordinate.h branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.cpp branches/0.18/src/node/x3d-nurbs/nurbs_trimmed_surface.h branches/0.18/src/node/x3d-nurbs/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/color_rgba.cpp branches/0.18/src/node/x3d-rendering/color_rgba.h branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_fan_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_set.h branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/indexed_triangle_strip_set.h branches/0.18/src/node/x3d-rendering/register_node_metatypes.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.cpp branches/0.18/src/node/x3d-rendering/triangle_fan_set.h branches/0.18/src/node/x3d-rendering/triangle_set.cpp branches/0.18/src/node/x3d-rendering/triangle_set.h branches/0.18/src/node/x3d-rendering/triangle_strip_set.cpp branches/0.18/src/node/x3d-rendering/triangle_strip_set.h branches/0.18/src/node/x3d-shape/fill_properties.cpp branches/0.18/src/node/x3d-shape/fill_properties.h branches/0.18/src/node/x3d-shape/line_properties.cpp branches/0.18/src/node/x3d-shape/line_properties.h branches/0.18/src/node/x3d-shape/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/multi_texture.cpp branches/0.18/src/node/x3d-texturing/multi_texture.h branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.cpp branches/0.18/src/node/x3d-texturing/multi_texture_coordinate.h branches/0.18/src/node/x3d-texturing/multi_texture_transform.cpp branches/0.18/src/node/x3d-texturing/multi_texture_transform.h branches/0.18/src/node/x3d-texturing/register_node_metatypes.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.cpp branches/0.18/src/node/x3d-texturing/texture_coordinate_generator.h Property changes on: branches/0.18 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/local:3677-3689 /branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Modified: branches/0.18/ChangeLog =================================================================== --- branches/0.18/ChangeLog 2010-05-03 03:50:23 UTC (rev 4141) +++ branches/0.18/ChangeLog 2010-05-03 03:53:16 UTC (rev 4142) @@ -1,5 +1,14 @@ 2010-05-02 Braden McDaniel <br...@en...> + fcfreetype.h is C++-safe in fontconfig >= 2.3.0. It should be + safe to require at least that version. + + * configure.ac: Require fontconfig >= 2.3.0. + * src/node/vrml97/text.cpp: Don't need to wrap fcfreetype.h in + 'extern "C"' anymore. + +2010-05-02 Braden McDaniel <br...@en...> + Added exception specifications for text_node::glyph_geometry and text_node::line_geometry member functions. Modified: branches/0.18/configure.ac =================================================================== --- branches/0.18/configure.ac 2010-05-03 03:50:23 UTC (rev 4141) +++ branches/0.18/configure.ac 2010-05-03 03:53:16 UTC (rev 4142) @@ -127,7 +127,10 @@ [AC_MSG_FAILURE([libxml not found])]) PKG_CHECK_MODULES([PNG], [libpng], , [have_libpng=no]) -PKG_CHECK_MODULES([FONTCONFIG], [fontconfig], , [have_fontconfig=no]) +# +# fcfreetype.h is C++-safe in fontconfig >= 2.3.0. +# +PKG_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.3.0], , [have_fontconfig=no]) PKG_CHECK_MODULES([FREETYPE], [freetype2], , [have_freetype=no]) # # FreeType >= 2.2 uses const in callback function signatures. This Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/bad_url.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/bad_url.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Property changes on: branches/0.18/src/libopenvrml/openvrml/bad_url.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /branches/node-modules/src/libopenvrml/openvrml/bad_url.h:3736-3801 /branches/node-modules/src/libopenvrml/openvrml/browser.h:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674 /trunk/src/libopenvrml/openvrml/bad_url.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Property changes on: branches/0.18/src/libopenvrml/openvrml/local/proto.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /branches/local/src/libopenvrml/openvrml/browser.cpp:3677-3689 /branches/node-modules/src/libopenvrml/openvrml/browser.cpp:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688 /branches/node-modules/src/libopenvrml/openvrml/local/proto.h:3736-3801 /trunk/src/libopenvrml/openvrml/local/proto.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/scene.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Property changes on: branches/0.18/src/libopenvrml/openvrml/scene.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/scene.h:3736-3801 /trunk/src/libopenvrml/openvrml/scene.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Property changes on: branches/0.18/src/libopenvrml/openvrml/script.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766,3824,3828,3836 /branches/node-modules/src/libopenvrml/openvrml/script.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/script.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Property changes on: branches/0.18/src/mozilla-plugin ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /trunk/src/mozilla-plugin:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Property changes on: branches/0.18/src/node/vrml97/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /branches/0.17/src/libopenvrml/openvrml/vrml97node.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/vrml97node.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/vrml97node.cpp:3401-3734 /trunk/src/node/vrml97/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Modified: branches/0.18/src/node/vrml97/text.cpp =================================================================== --- branches/0.18/src/node/vrml97/text.cpp 2010-05-03 03:50:23 UTC (rev 4141) +++ branches/0.18/src/node/vrml97/text.cpp 2010-05-03 03:53:16 UTC (rev 4142) @@ -37,9 +37,7 @@ # undef interface # else # include <fontconfig/fontconfig.h> -extern "C" { # include <fontconfig/fcfreetype.h> -} # endif # endif # include <boost/array.hpp> Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Property changes on: branches/0.18/src/node/x3d-cad-geometry/cad_face.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /branches/node-modules/src/node/x3d-cad-geometry/cad_face.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/cad_face.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Property changes on: branches/0.18/src/node/x3d-cad-geometry/indexed_quad_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /branches/node-modules/src/node/x3d-cad-geometry/indexed_quad_set.h:3736-3801 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3630 /trunk/src/node/x3d-cad-geometry/indexed_quad_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Property changes on: branches/0.18/src/node/x3d-cad-geometry/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /branches/0.17/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_cad_geometry.cpp:3401-3734 /trunk/src/node/x3d-cad-geometry/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /branches/local/src/node/x3d-core/metadata_double.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Property changes on: branches/0.18/src/node/x3d-core/metadata_double.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /branches/local/src/node/x3d-core/metadata_double.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_double.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_double.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /branches/local/src/node/x3d-core/metadata_float.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Property changes on: branches/0.18/src/node/x3d-core/metadata_float.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /branches/local/src/node/x3d-core/metadata_float.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_float.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_float.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /branches/local/src/node/x3d-core/metadata_integer.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Property changes on: branches/0.18/src/node/x3d-core/metadata_integer.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /branches/local/src/node/x3d-core/metadata_integer.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_integer.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_integer.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /branches/local/src/node/x3d-core/metadata_set.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Property changes on: branches/0.18/src/node/x3d-core/metadata_set.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /branches/local/src/node/x3d-core/metadata_set.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_set.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_set.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /branches/local/src/node/x3d-core/metadata_string.cpp:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.cpp:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Property changes on: branches/0.18/src/node/x3d-core/metadata_string.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /branches/local/src/node/x3d-core/metadata_string.h:3677-3689 /branches/node-modules/src/node/x3d-core/metadata_string.h:3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/node/x3d-core/metadata_string.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Property changes on: branches/0.18/src/node/x3d-core/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /branches/0.17/src/libopenvrml/openvrml/x3d_core.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_core.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_core.cpp:3401-3734 /trunk/src/node/x3d-core/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /branches/local/src/node/x3d-dis/espdu_transform.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Property changes on: branches/0.18/src/node/x3d-dis/espdu_transform.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /branches/local/src/node/x3d-dis/espdu_transform.h:3677-3689 /branches/node-modules/src/node/x3d-dis/espdu_transform.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/espdu_transform.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /branches/local/src/node/x3d-dis/receiver_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Property changes on: branches/0.18/src/node/x3d-dis/receiver_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /branches/local/src/node/x3d-dis/receiver_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/receiver_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/receiver_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Property changes on: branches/0.18/src/node/x3d-dis/register_node_metatypes.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /branches/0.17/src/libopenvrml/openvrml/x3d_dis.cpp:3713,3717,3719,3721,3725,3730,3732 /branches/local/src/libopenvrml/openvrml/x3d_dis.cpp:3677-3689 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3734 /trunk/src/node/x3d-dis/register_node_metatypes.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.cpp ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139 + /branches/local/src/node/x3d-dis/signal_pdu.cpp:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.cpp:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.cpp:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129,4131,4133,4135,4137,4139,4141 Property changes on: branches/0.18/src/node/x3d-dis/signal_pdu.h ___________________________________________________________________ Modified: svn:mergeinfo - /branches/local/src/node/x3d-dis/signal_pdu.h:3677-3689 /branches/node-modules/src/node/x3d-dis/signal_pdu.h:3667-3668,3670-3671,3673-3674,3684-3685,3687-3688,3736-3801 /trunk/src/libopenvrml/openvrml/x3d_dis.cpp:3401-3630 /trunk/src/node/x3d-dis/signal_pdu.h:3958,3965,3967,3969,3971,3973,3975-3976,3979,3981,3983,3985,3987,3989,3991,3997,3999,4001,4003,4005,4011,4013-4014,4017,4019,4021,4024,4026,4028,4030,4032,4041,4043,4045,4053,4055,4057,4059,4061,4063,4065,4067,4069,4071,4073,4075,4077,4079,4081,4083,4085,4087,4089,4091,4093,4095,4097,4099,4101,4108,4113,4115,4117,4119-4120,4122,4124,4129... [truncated message content] |