openvrml-commit — Changes to OpenVRML's source revision repository

[openvrml-commit] openvrml ChangeLog,1.1310.2.83,1.1310.2.84

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7830

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	ChangeLog 
Log Message:
Factored platform-specific code in text_node::update_face into its own function.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1310.2.83
retrieving revision 1.1310.2.84
diff -C2 -d -r1.1310.2.83 -r1.1310.2.84
*** ChangeLog	2 Jan 2007 00:07:28 -0000	1.1310.2.83
--- ChangeLog	2 Jan 2007 03:54:39 -0000	1.1310.2.84
***************
*** 1,4 ****
--- 1,17 ----
  2007-01-01 Braden McDaniel  <br...@en...>
  
+ 	Factored platform-specific code in text_node::update_face into its
+ 	own function.
+ 
+ 	* src/libopenvrml/openvrml/vrml97node.cpp
+ 	(get_font_filename(const std::vector<std::string> &, const
+ 	std::string &, const unsigned_char_string &, std::vector<char> &,
+ 	FT_Long &)): Get the font file name and face index.  This code was
+ 	factored out of text_node::update_face.
+ 	(text_node::update_face()): Factored platform-specifc code to get
+ 	the font filename to get_font_filaname.
+ 
+ 2007-01-01 Braden McDaniel  <br...@en...>
+ 
  	ScopeGuard as initially described by Alexandrescu and Marginean
  	copies the callback function parameters to the guard

[openvrml-commit] openvrml/src/libopenvrml/openvrml vrml97node.cpp, 1.108.2.7, 1.108.2.8

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7830/src/libopenvrml/openvrml

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	vrml97node.cpp 
Log Message:
Factored platform-specific code in text_node::update_face into its own function.

Index: vrml97node.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/vrml97node.cpp,v
retrieving revision 1.108.2.7
retrieving revision 1.108.2.8
diff -C2 -d -r1.108.2.7 -r1.108.2.8
*** vrml97node.cpp	2 Jan 2007 00:07:29 -0000	1.108.2.7
--- vrml97node.cpp	2 Jan 2007 03:54:39 -0000	1.108.2.8
***************
*** 22889,22892 ****
--- 22889,23100 ----
      };
  
+     typedef std::basic_string<unsigned char, unsigned_char_traits>
+         unsigned_char_string;
+ 
+     OPENVRML_LOCAL void
+     get_font_filename(const std::vector<std::string> & family,
+                       const std::string & style,
+                       const unsigned_char_string & language,
+                       std::vector<char> & filename,
+                       FT_Long & face_index)
+     {
+         using std::vector;
+ # ifdef _WIN32
+         LOGFONT lf;
+         lf.lfHeight =         0;
+         lf.lfWidth =          0;
+         lf.lfEscapement =     0;
+         lf.lfOrientation =    0;
+         lf.lfWeight =         FW_MEDIUM;
+         lf.lfItalic =         FALSE;
+         lf.lfUnderline =      FALSE;
+         lf.lfStrikeOut =      FALSE;
+         lf.lfCharSet =        DEFAULT_CHARSET;
+         lf.lfOutPrecision =   OUT_TT_ONLY_PRECIS;
+         lf.lfClipPrecision =  CLIP_DEFAULT_PRECIS;
+         lf.lfQuality =        DEFAULT_QUALITY;
+         lf.lfPitchAndFamily = VARIABLE_PITCH | FF_ROMAN;
+ 
+         HDC hdc = CreateCompatibleDC(0);
+         scope_guard hdc_guard = make_guard(&DeleteDC, hdc);
+         HFONT hfont = CreateFontIndirect(&lf);
+         SelectObject(hdc, hfont);
+         TCHAR faceName[256] = {};
+         GetTextFace(hdc, sizeof faceName / sizeof (TCHAR), faceName);
+         const int faceNameLen = lstrlen(faceName);
+ 
+         //
+         // Get the fonts folder.
+         //
+         TCHAR fontsPath[MAX_PATH];
+         HRESULT status =
+             SHGetFolderPath(NULL, CSIDL_FONTS, NULL, SHGFP_TYPE_CURRENT,
+                             fontsPath);
+         if (FAILED(status)) { /* bail */ }
+ 
+         //
+         // Enumerate the fonts in the registry and pick one that matches.
+         //
+         HKEY fontsKey;
+         LONG result =
+             RegOpenKeyEx(
+                 HKEY_LOCAL_MACHINE,
+                 "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts",
+                 0,
+                 KEY_READ,
+                 &fontsKey);
+         if (result != ERROR_SUCCESS) { /* bail */ }
+         scope_guard fontsKey_guard = make_guard(&RegCloseKey, fontsKey);
+ 
+         DWORD maxValueNameLen, maxValueLen;
+         result = RegQueryInfoKey(fontsKey,
+                                  NULL,  // lpClass
+                                  NULL,  // lpcClass
+                                  NULL,  // lpReserved
+                                  NULL,  // lpcSubKeys
+                                  NULL,  // lpcMaxSubKeyLen
+                                  NULL,  // lpcMaxClassLen
+                                  NULL,  // lpcValues
+                                  &maxValueNameLen,
+                                  &maxValueLen,
+                                  NULL,  // lpcbSecurityDescriptor
+                                  NULL); // lpftLastWriteTime
+ 
+         DWORD index = 0;
+         vector<TCHAR> valueName(maxValueNameLen + 1);
+         DWORD type;
+         vector<BYTE> data(maxValueLen);
+         TCHAR fontPath[MAX_PATH] = {};
+         result = ERROR_SUCCESS;
+         while (result != ERROR_NO_MORE_ITEMS) {
+             DWORD dataLength = DWORD(data.size());
+             DWORD valueNameLength = DWORD(valueName.size());
+             result = RegEnumValue(fontsKey,
+                                   index,
+                                   &valueName.front(),
+                                   &valueNameLength,
+                                   NULL,
+                                   &type,
+                                   &data.front(),
+                                   &dataLength);
+             if (result == ERROR_MORE_DATA) {
+                 data.resize(dataLength);
+                 continue;
+             }
+             if (result == ERROR_SUCCESS) {
+                 if (DWORD(faceNameLen + 1) <= valueNameLength
+                     && std::equal(faceName, faceName + faceNameLen,
+                                   valueName.begin())) {
+                     HRESULT strcat_result = StringCchCat(fontPath,
+                                                          MAX_PATH,
+                                                          fontsPath);
+                     assert(SUCCEEDED(strcat_result));
+                     strcat_result = StringCchCat(fontPath, MAX_PATH, "\\");
+                     assert(SUCCEEDED(strcat_result));
+                     strcat_result =
+                         StringCchCat(fontPath,
+                                      MAX_PATH,
+                                      reinterpret_cast<STRSAFE_LPCSTR>(
+                                          &data.front()));
+                     assert(SUCCEEDED(strcat_result));
+                     break;
+                 }
+                 ++index;
+             }
+         }
+ 
+         const size_t fontPathLen = lstrlen(fontPath);
+         assert(fontPathLen != 0);
+         filename.assign(fontPath, fontPath + fontPathLen + 1);
+         face_index = 0;
+ # else
+         using std::string;
+ 
+         string fontName;
+         //
+         // Set the family.
+         //
+         for (size_t i = 0; i < family.size(); ++i) {
+             const string & element = family[i];
+             if (element == "SERIF") {
+                 fontName += "serif";
+             } else if (element == "SANS") {
+                 fontName += "sans";
+             } else if (element == "TYPEWRITER") {
+                 fontName += "monospace";
+             } else {
+                 fontName += element;
+             }
+             if (i + 1 < family.size()) { fontName += ", "; }
+         }
+ 
+         //
+         // Set the weight.
+         //
+         if (style.find("BOLD") != string::npos) {
+             fontName += ":bold";
+         }
+ 
+         //
+         // Set the slant.
+         //
+         if (style.find("ITALIC") != string::npos) {
+             fontName += ":italic";
+         }
+ 
+         //
+         // For now, at least, we only want outline fonts.
+         //
+         fontName += ":outline=True";
+ 
+         FcPattern * const initialPattern =
+             FcNameParse(unsigned_char_string(fontName.begin(),
+                                              fontName.end()).c_str());
+         if (!initialPattern) { throw std::bad_alloc(); }
+         scope_guard initialPattern_guard =
+             make_guard(&FcPatternDestroy, initialPattern);
+         boost::ignore_unused_variable_warning(initialPattern_guard);
+ 
+         //
+         // Set the language.
+         //
+         if (!language.empty()) {
+             FcPatternAddString(initialPattern,
+                                FC_LANG,
+                                language.c_str());
+         }
+ 
+         FcConfigSubstitute(0, initialPattern, FcMatchPattern);
+         FcDefaultSubstitute(initialPattern);
+ 
+         FcResult result = FcResultMatch;
+         FcPattern * const matchedPattern =
+             FcFontMatch(0, initialPattern, &result);
+         if (result != FcResultMatch) { throw FontconfigError(result); }
+         assert(matchedPattern);
+         scope_guard matchedPattern_guard =
+             make_guard(&FcPatternDestroy, matchedPattern);
+         boost::ignore_unused_variable_warning(matchedPattern_guard);
+ 
+         FcChar8 * filename_c_str = 0;
+         result = FcPatternGetString(matchedPattern,
+                                     FC_FILE,
+                                     0,
+                                     &filename_c_str);
+         if (result != FcResultMatch) { throw FontconfigError(result); }
+ 
+         size_t filenameLen = 0;
+         for (; filename_c_str[filenameLen]; ++filenameLen) {}
+ 
+         filename.assign(filename_c_str, filename_c_str + filenameLen + 1);
+ 
+         int face_index_int = 0;
+         result = FcPatternGetInteger(matchedPattern, FC_INDEX, 0,
+                                      &face_index_int);
+         if (result != FcResultMatch) { throw FontconfigError(result); }
+         face_index = FT_Long(face_index_int);
+ # endif
+     }
+ 
  # endif // OPENVRML_ENABLE_RENDER_TEXT_NODE
  
***************
*** 22900,22905 ****
  # ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE
          using std::string;
-         typedef std::basic_string<unsigned char, unsigned_char_traits>
-             unsigned_char_string;
  
          unsigned_char_string language;
--- 23108,23111 ----
***************
*** 22923,23124 ****
  
          try {
! #   ifdef _WIN32
!             LOGFONT lf;
!             lf.lfHeight =         0;
!             lf.lfWidth =          0;
!             lf.lfEscapement =     0;
!             lf.lfOrientation =    0;
!             lf.lfWeight =         FW_MEDIUM;
!             lf.lfItalic =         FALSE;
!             lf.lfUnderline =      FALSE;
!             lf.lfStrikeOut =      FALSE;
!             lf.lfCharSet =        DEFAULT_CHARSET;
!             lf.lfOutPrecision =   OUT_TT_ONLY_PRECIS;
!             lf.lfClipPrecision =  CLIP_DEFAULT_PRECIS;
!             lf.lfQuality =        DEFAULT_QUALITY;
!             lf.lfPitchAndFamily = VARIABLE_PITCH | FF_ROMAN;
! 
!             HDC hdc = CreateCompatibleDC(0);
!             scope_guard hdc_guard = make_guard(&DeleteDC, hdc);
!             HFONT hfont = CreateFontIndirect(&lf);
!             SelectObject(hdc, hfont);
!             TCHAR faceName[256] = {};
!             GetTextFace(hdc, sizeof faceName / sizeof (TCHAR), faceName);
!             const int faceNameLen = lstrlen(faceName);
! 
!             //
!             // Get the fonts folder.
!             //
!             TCHAR fontsPath[MAX_PATH];
!             HRESULT status =
!                 SHGetFolderPath(NULL, CSIDL_FONTS, NULL, SHGFP_TYPE_CURRENT,
!                                 fontsPath);
!             if (FAILED(status)) { /* bail */ }
! 
!             //
!             // Enumerate the fonts in the registry and pick one that matches.
!             //
!             HKEY fontsKey;
!             LONG result =
!                 RegOpenKeyEx(
!                     HKEY_LOCAL_MACHINE,
!                     "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts",
!                     0,
!                     KEY_READ,
!                     &fontsKey);
!             if (result != ERROR_SUCCESS) { /* bail */ }
!             scope_guard fontsKey_guard = make_guard(&RegCloseKey, fontsKey);
! 
!             DWORD maxValueNameLen, maxValueLen;
!             result = RegQueryInfoKey(fontsKey,
!                                      NULL,  // lpClass
!                                      NULL,  // lpcClass
!                                      NULL,  // lpReserved
!                                      NULL,  // lpcSubKeys
!                                      NULL,  // lpcMaxSubKeyLen
!                                      NULL,  // lpcMaxClassLen
!                                      NULL,  // lpcValues
!                                      &maxValueNameLen,
!                                      &maxValueLen,
!                                      NULL,  // lpcbSecurityDescriptor
!                                      NULL); // lpftLastWriteTime
! 
!             DWORD index = 0;
!             std::vector<TCHAR> valueName(maxValueNameLen + 1);
!             DWORD type;
!             std::vector<BYTE> data(maxValueLen);
!             TCHAR fontPath[MAX_PATH] = {};
!             result = ERROR_SUCCESS;
!             while (result != ERROR_NO_MORE_ITEMS) {
!                 DWORD dataLength = DWORD(data.size());
!                 DWORD valueNameLength = DWORD(valueName.size());
!                 result = RegEnumValue(fontsKey,
!                                       index,
!                                       &valueName.front(),
!                                       &valueNameLength,
!                                       NULL,
!                                       &type,
!                                       &data.front(),
!                                       &dataLength);
!                 if (result == ERROR_MORE_DATA) {
!                     data.resize(dataLength);
!                     continue;
!                 }
!                 if (result == ERROR_SUCCESS) {
!                     if (DWORD(faceNameLen + 1) <= valueNameLength
!                         && std::equal(faceName, faceName + faceNameLen,
!                                       valueName.begin())) {
!                         HRESULT strcat_result = StringCchCat(fontPath,
!                                                              MAX_PATH,
!                                                              fontsPath);
!                         assert(SUCCEEDED(strcat_result));
!                         strcat_result = StringCchCat(fontPath,
!                                                      MAX_PATH,
!                                                      "\\");
!                         assert(SUCCEEDED(strcat_result));
!                         strcat_result =
!                             StringCchCat(fontPath,
!                                          MAX_PATH,
!                                          reinterpret_cast<STRSAFE_LPCSTR>(
!                                              &data.front()));
!                         assert(SUCCEEDED(strcat_result));
!                         break;
!                     }
!                     ++index;
!                 }
!             }
! 
!             const size_t fontPathLen = lstrlen(fontPath);
!             assert(fontPathLen != 0);
!             const std::vector<char> ftFilename(fontPath,
!                                                fontPath + fontPathLen + 1);
!             const FT_Long face_index = 0;
! #   else // Everybody else use fontconfig.
!             using std::vector;
! 
!             string fontName;
!             //
!             // Set the family.
!             //
!             for (size_t i = 0; i < family.size(); ++i) {
!                 const std::string & element = family[i];
!                 if (element == "SERIF") {
!                     fontName += "serif";
!                 } else if (element == "SANS") {
!                     fontName += "sans";
!                 } else if (element == "TYPEWRITER") {
!                     fontName += "monospace";
!                 } else {
!                     fontName += element;
!                 }
!                 if (i + 1 < family.size()) { fontName += ", "; }
!             }
! 
!             //
!             // Set the weight.
!             //
!             if (style.find("BOLD") != string::npos) {
!                 fontName += ":bold";
!             }
! 
!             //
!             // Set the slant.
!             //
!             if (style.find("ITALIC") != string::npos) {
!                 fontName += ":italic";
!             }
! 
!             //
!             // For now, at least, we only want outline fonts.
!             //
!             fontName += ":outline=True";
! 
!             FcPattern * const initialPattern =
!                 FcNameParse(unsigned_char_string(fontName.begin(),
!                                                  fontName.end()).c_str());
!             if (!initialPattern) { throw std::bad_alloc(); }
!             scope_guard initialPattern_guard =
!                 make_guard(&FcPatternDestroy, initialPattern);
!             boost::ignore_unused_variable_warning(initialPattern_guard);
! 
!             //
!             // Set the language.
!             //
!             if (!language.empty()) {
!                 FcPatternAddString(initialPattern,
!                                    FC_LANG,
!                                    language.c_str());
!             }
! 
!             FcConfigSubstitute(0, initialPattern, FcMatchPattern);
!             FcDefaultSubstitute(initialPattern);
! 
!             FcResult result = FcResultMatch;
!             FcPattern * const matchedPattern =
!                 FcFontMatch(0, initialPattern, &result);
!             if (result != FcResultMatch) { throw FontconfigError(result); }
!             assert(matchedPattern);
!             scope_guard matchedPattern_guard =
!                 make_guard(&FcPatternDestroy, matchedPattern);
!             boost::ignore_unused_variable_warning(matchedPattern_guard);
! 
!             FcChar8 * filename = 0;
!             result = FcPatternGetString(matchedPattern,
!                                         FC_FILE,
!                                         0,
!                                         &filename);
!             if (result != FcResultMatch) { throw FontconfigError(result); }
! 
!             int face_index = 0;
!             result = FcPatternGetInteger(matchedPattern, FC_INDEX, 0,
!                                          &face_index);
!             if (result != FcResultMatch) { throw FontconfigError(result); }
! 
!             size_t filenameLen = 0;
!             for (; filename[filenameLen]; ++filenameLen) {}
  
-             const vector<char> ftFilename(filename,
-                                           filename + filenameLen + 1);
- #   endif // ifdef _WIN32
              text_metatype & nodeClass =
                  const_cast<text_metatype &>(
--- 23129,23136 ----
  
          try {
!             std::vector<char> ftFilename;
!             FT_Long face_index;
!             get_font_filename(family, style, language, ftFilename, face_index);
  
              text_metatype & nodeClass =
                  const_cast<text_metatype &>(

[openvrml-commit] openvrml/src/libopenvrml/openvrml vrml97node.cpp, 1.116, 1.117

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16735/src/libopenvrml/openvrml

Modified Files:
	vrml97node.cpp 
Log Message:
ScopeGuard as initially described by Alexandrescu and Marginean copies the callback function parameters to the guard implementation.  This means that the callback is called with the values given when make_guard gets called--not whatever the values might be when execution in the scope completes.
> 
> This changes OpenVRML's implementation of ScopeGuard to keep const references to the parameters in the guard implementation.  Also, use of boost::multi_index::detail::scope_guard (where use of OpenVRML's ScopeGuard implementation is inconvenient) now explicitly gives a reference template parameter to the instantiation of make_guard to circumvent this problem.

Index: vrml97node.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/vrml97node.cpp,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -d -r1.116 -r1.117
*** vrml97node.cpp	28 Dec 2006 23:12:20 -0000	1.116
--- vrml97node.cpp	2 Jan 2007 00:08:33 -0000	1.117
***************
*** 39,43 ****
  # include <boost/algorithm/string/predicate.hpp>
  # include <boost/array.hpp>
- # include <boost/multi_index/detail/scope_guard.hpp>
  # include <boost/thread.hpp>
  # ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE
--- 39,42 ----
***************
*** 69,73 ****
      using namespace openvrml;
      using namespace openvrml::node_impl_util;
-     using namespace boost::multi_index::detail; // for scope_guard
  
      /**
--- 68,71 ----

[openvrml-commit] openvrml ChangeLog,1.1405,1.1406

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16735

Modified Files:
	ChangeLog 
Log Message:
ScopeGuard as initially described by Alexandrescu and Marginean copies the callback function parameters to the guard implementation.  This means that the callback is called with the values given when make_guard gets called--not whatever the values might be when execution in the scope completes.
> 
> This changes OpenVRML's implementation of ScopeGuard to keep const references to the parameters in the guard implementation.  Also, use of boost::multi_index::detail::scope_guard (where use of OpenVRML's ScopeGuard implementation is inconvenient) now explicitly gives a reference template parameter to the instantiation of make_guard to circumvent this problem.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1405
retrieving revision 1.1406
diff -C2 -d -r1.1405 -r1.1406
*** ChangeLog	1 Jan 2007 21:25:45 -0000	1.1405
--- ChangeLog	2 Jan 2007 00:08:33 -0000	1.1406
***************
*** 1,4 ****
--- 1,35 ----
  2007-01-01 Braden McDaniel  <br...@en...>
  
+ 	ScopeGuard as initially described by Alexandrescu and Marginean
+ 	copies the callback function parameters to the guard
+ 	implementation.  This means that the callback is called with the
+ 	values given when make_guard gets called--not whatever the values
+ 	might be when execution in the scope completes.
+ 
+ 	This changes OpenVRML's implementation of ScopeGuard to keep const
+ 	references to the parameters in the guard implementation. Also,
+ 	use of boost::multi_index::detail::scope_guard (where use of
+ 	OpenVRML's ScopeGuard implementation is inconvenient) now
+ 	explicitly gives a reference template parameter to the
+ 	instantiation of make_guard to circumvent this problem.
+ 
+ 	* mozilla-plugin/src/openvrml.cpp
+ 	(plugin_instance::set_window(NPWindow &)): Explicitly give a
+ 	reference template parameter to make_guard so that the guard
+ 	implementation stores a reference to the callback parameter
+ 	argument.
+ 	* src/libopenvrml/private.h
+ 	(openvrml_::scope_guard_impl1): Store a reference to the callback
+ 	function parameter.
+ 	(openvrml_::scope_guard_impl3): Store a reference to the callback
+ 	function parameter.
+ 	(openvrml_::obj_scope_guard_impl1): Store a reference to the
+ 	callback function parameter.
+ 	* src/libopenvrml/openvrml/vrml97node.cpp: Removed references to
+ 	boost::multi_index::detail; that ScopeGuard implementation is not
+ 	used here.
+ 
+ 2007-01-01 Braden McDaniel  <br...@en...>
+ 
  	Fixed SFRotation axis normalization checks in the Script node
  	JavaScript binding.

[openvrml-commit] openvrml/mozilla-plugin/src openvrml.cpp, 1.48, 1.49

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/mozilla-plugin/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16735/mozilla-plugin/src

Modified Files:
	openvrml.cpp 
Log Message:
ScopeGuard as initially described by Alexandrescu and Marginean copies the callback function parameters to the guard implementation.  This means that the callback is called with the values given when make_guard gets called--not whatever the values might be when execution in the scope completes.
> 
> This changes OpenVRML's implementation of ScopeGuard to keep const references to the parameters in the guard implementation.  Also, use of boost::multi_index::detail::scope_guard (where use of OpenVRML's ScopeGuard implementation is inconvenient) now explicitly gives a reference template parameter to the instantiation of make_guard to circumvent this problem.

Index: openvrml.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** openvrml.cpp	6 Dec 2006 01:58:50 -0000	1.48
--- openvrml.cpp	2 Jan 2007 00:08:33 -0000	1.49
***************
*** 1123,1127 ****
          gchar ** openvrml_gtkplug_cmd_argv = 0;
          scope_guard openvrml_gtkplug_cmd_argv_guard =
!             make_guard(g_strfreev, openvrml_gtkplug_cmd_argv);
          boost::ignore_unused_variable_warning(openvrml_gtkplug_cmd_argv_guard);
          const gchar * const openvrml_gtkplug_cmd =
--- 1123,1128 ----
          gchar ** openvrml_gtkplug_cmd_argv = 0;
          scope_guard openvrml_gtkplug_cmd_argv_guard =
!             make_guard<void (*)(gchar **), gchar ** &>(
!                 g_strfreev, openvrml_gtkplug_cmd_argv);
          boost::ignore_unused_variable_warning(openvrml_gtkplug_cmd_argv_guard);
          const gchar * const openvrml_gtkplug_cmd =
***************
*** 1137,1141 ****
          } else {
              GError * error = 0;
!             scope_guard error_guard = make_guard(g_error_free, error);
              gboolean succeeded =
                  g_shell_parse_argv(openvrml_gtkplug_cmd,
--- 1138,1144 ----
          } else {
              GError * error = 0;
!             scope_guard error_guard =
!                 make_guard<void (*)(GError *), GError * &>(g_error_free,
!                                                            error);
              gboolean succeeded =
                  g_shell_parse_argv(openvrml_gtkplug_cmd,
***************
*** 1188,1192 ****
          gint * const standard_error = 0;
          GError * error = 0;
!         scope_guard error_guard = make_guard(g_error_free, error);
          gboolean succeeded = g_spawn_async_with_pipes(working_dir,
                                                        argv,
--- 1191,1196 ----
          gint * const standard_error = 0;
          GError * error = 0;
!         scope_guard error_guard =
!             make_guard<void (*)(GError *), GError * &>(g_error_free, error);
          gboolean succeeded = g_spawn_async_with_pipes(working_dir,
                                                        argv,

[openvrml-commit] openvrml/src/libopenvrml private.h,1.12,1.13

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/src/libopenvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16735/src/libopenvrml

Modified Files:
	private.h 
Log Message:
ScopeGuard as initially described by Alexandrescu and Marginean copies the callback function parameters to the guard implementation.  This means that the callback is called with the values given when make_guard gets called--not whatever the values might be when execution in the scope completes.
> 
> This changes OpenVRML's implementation of ScopeGuard to keep const references to the parameters in the guard implementation.  Also, use of boost::multi_index::detail::scope_guard (where use of OpenVRML's ScopeGuard implementation is inconvenient) now explicitly gives a reference template parameter to the instantiation of make_guard to circumvent this problem.

Index: private.h
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/private.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** private.h	23 Oct 2006 06:39:28 -0000	1.12
--- private.h	2 Jan 2007 00:08:33 -0000	1.13
***************
*** 191,195 ****
          class OPENVRML_LOCAL scope_guard_impl1 : public scope_guard_impl_base {
              Function function;
!             const Param param;
  
          public:
--- 191,195 ----
          class OPENVRML_LOCAL scope_guard_impl1 : public scope_guard_impl_base {
              Function function;
!             const Param & param;
  
          public:
***************
*** 224,230 ****
          class OPENVRML_LOCAL scope_guard_impl3 : public scope_guard_impl_base {
              Function function;
!             const Param1 param1;
!             const Param2 param2;
!             const Param3 param3;
  
          public:
--- 224,230 ----
          class OPENVRML_LOCAL scope_guard_impl3 : public scope_guard_impl_base {
              Function function;
!             const Param1 & param1;
!             const Param2 & param2;
!             const Param3 & param3;
  
          public:
***************
*** 315,319 ****
              Object & obj;
              MemberFunction mem_fun;
!             const Param param;
  
          public:
--- 315,319 ----
              Object & obj;
              MemberFunction mem_fun;
!             const Param & param;
  
          public:

[openvrml-commit] openvrml/src/libopenvrml/openvrml vrml97node.cpp, 1.108.2.6, 1.108.2.7

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16287/src/libopenvrml/openvrml

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	vrml97node.cpp 
Log Message:
ScopeGuard as initially described by Alexandrescu and Marginean copies the callback function parameters to the guard implementation.  This means that the callback is called with the values given when make_guard gets called--not whatever the values might be when execution in the scope completes.

This changes OpenVRML's implementation of ScopeGuard to keep const references to the parameters in the guard implementation.  Also, use of boost::multi_index::detail::scope_guard (where use of OpenVRML's ScopeGuard implementation is inconvenient) now explicitly gives a reference template parameter to the instantiation of make_guard to circumvent this problem.

Index: vrml97node.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/vrml97node.cpp,v
retrieving revision 1.108.2.6
retrieving revision 1.108.2.7
diff -C2 -d -r1.108.2.6 -r1.108.2.7
*** vrml97node.cpp	28 Dec 2006 23:10:59 -0000	1.108.2.6
--- vrml97node.cpp	2 Jan 2007 00:07:29 -0000	1.108.2.7
***************
*** 39,43 ****
  # include <boost/algorithm/string/predicate.hpp>
  # include <boost/array.hpp>
- # include <boost/multi_index/detail/scope_guard.hpp>
  # include <boost/thread.hpp>
  # ifdef OPENVRML_ENABLE_RENDER_TEXT_NODE
--- 39,42 ----
***************
*** 69,73 ****
      using namespace openvrml;
      using namespace openvrml::node_impl_util;
-     using namespace boost::multi_index::detail; // for scope_guard
  
      /**
--- 68,71 ----

[openvrml-commit] openvrml/mozilla-plugin/src openvrml.cpp, 1.37.2.11, 1.37.2.12

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/mozilla-plugin/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16287/mozilla-plugin/src

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	openvrml.cpp 
Log Message:
ScopeGuard as initially described by Alexandrescu and Marginean copies the callback function parameters to the guard implementation.  This means that the callback is called with the values given when make_guard gets called--not whatever the values might be when execution in the scope completes.

This changes OpenVRML's implementation of ScopeGuard to keep const references to the parameters in the guard implementation.  Also, use of boost::multi_index::detail::scope_guard (where use of OpenVRML's ScopeGuard implementation is inconvenient) now explicitly gives a reference template parameter to the instantiation of make_guard to circumvent this problem.

Index: openvrml.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml.cpp,v
retrieving revision 1.37.2.11
retrieving revision 1.37.2.12
diff -C2 -d -r1.37.2.11 -r1.37.2.12
*** openvrml.cpp	6 Dec 2006 01:58:38 -0000	1.37.2.11
--- openvrml.cpp	2 Jan 2007 00:07:28 -0000	1.37.2.12
***************
*** 1123,1127 ****
          gchar ** openvrml_gtkplug_cmd_argv = 0;
          scope_guard openvrml_gtkplug_cmd_argv_guard =
!             make_guard(g_strfreev, openvrml_gtkplug_cmd_argv);
          boost::ignore_unused_variable_warning(openvrml_gtkplug_cmd_argv_guard);
          const gchar * const openvrml_gtkplug_cmd =
--- 1123,1128 ----
          gchar ** openvrml_gtkplug_cmd_argv = 0;
          scope_guard openvrml_gtkplug_cmd_argv_guard =
!             make_guard<void (*)(gchar **), gchar ** &>(
!                 g_strfreev, openvrml_gtkplug_cmd_argv);
          boost::ignore_unused_variable_warning(openvrml_gtkplug_cmd_argv_guard);
          const gchar * const openvrml_gtkplug_cmd =
***************
*** 1137,1141 ****
          } else {
              GError * error = 0;
!             scope_guard error_guard = make_guard(g_error_free, error);
              gboolean succeeded =
                  g_shell_parse_argv(openvrml_gtkplug_cmd,
--- 1138,1144 ----
          } else {
              GError * error = 0;
!             scope_guard error_guard =
!                 make_guard<void (*)(GError *), GError * &>(g_error_free,
!                                                            error);
              gboolean succeeded =
                  g_shell_parse_argv(openvrml_gtkplug_cmd,
***************
*** 1188,1192 ****
          gint * const standard_error = 0;
          GError * error = 0;
!         scope_guard error_guard = make_guard(g_error_free, error);
          gboolean succeeded = g_spawn_async_with_pipes(working_dir,
                                                        argv,
--- 1191,1196 ----
          gint * const standard_error = 0;
          GError * error = 0;
!         scope_guard error_guard =
!             make_guard<void (*)(GError *), GError * &>(g_error_free, error);
          gboolean succeeded = g_spawn_async_with_pipes(working_dir,
                                                        argv,

[openvrml-commit] openvrml ChangeLog,1.1310.2.82,1.1310.2.83

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16287

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	ChangeLog 
Log Message:
ScopeGuard as initially described by Alexandrescu and Marginean copies the callback function parameters to the guard implementation.  This means that the callback is called with the values given when make_guard gets called--not whatever the values might be when execution in the scope completes.

This changes OpenVRML's implementation of ScopeGuard to keep const references to the parameters in the guard implementation.  Also, use of boost::multi_index::detail::scope_guard (where use of OpenVRML's ScopeGuard implementation is inconvenient) now explicitly gives a reference template parameter to the instantiation of make_guard to circumvent this problem.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1310.2.82
retrieving revision 1.1310.2.83
diff -C2 -d -r1.1310.2.82 -r1.1310.2.83
*** ChangeLog	1 Jan 2007 21:25:20 -0000	1.1310.2.82
--- ChangeLog	2 Jan 2007 00:07:28 -0000	1.1310.2.83
***************
*** 1,4 ****
--- 1,35 ----
  2007-01-01 Braden McDaniel  <br...@en...>
  
+ 	ScopeGuard as initially described by Alexandrescu and Marginean
+ 	copies the callback function parameters to the guard
+ 	implementation.  This means that the callback is called with the
+ 	values given when make_guard gets called--not whatever the values
+ 	might be when execution in the scope completes.
+ 
+ 	This changes OpenVRML's implementation of ScopeGuard to keep const
+ 	references to the parameters in the guard implementation.  Also,
+ 	use of boost::multi_index::detail::scope_guard (where use of
+ 	OpenVRML's ScopeGuard implementation is inconvenient) now
+ 	explicitly gives a reference template parameter to the
+ 	instantiation of make_guard to circumvent this problem.
+ 
+ 	* mozilla-plugin/src/openvrml.cpp
+ 	(plugin_instance::set_window(NPWindow &)): Explicitly give a
+ 	reference template parameter to make_guard so that the guard
+ 	implementation stores a reference to the callback parameter
+ 	argument.
+ 	* src/libopenvrml/private.h
+ 	(openvrml_::scope_guard_impl1): Store a reference to the callback
+ 	function parameter.
+ 	(openvrml_::scope_guard_impl3): Store a reference to the callback
+ 	function parameter.
+ 	(openvrml_::obj_scope_guard_impl1): Store a reference to the
+ 	callback function parameter.
+ 	* src/libopenvrml/openvrml/vrml97node.cpp: Removed references to
+ 	boost::multi_index::detail; that ScopeGuard implementation is not
+ 	used here.
+ 
+ 2007-01-01 Braden McDaniel  <br...@en...>
+ 
  	Fixed SFRotation axis normalization checks in the Script node
  	JavaScript binding.

[openvrml-commit] openvrml/src/libopenvrml private.h, 1.11.2.1, 1.11.2.2

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/src/libopenvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16287/src/libopenvrml

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	private.h 
Log Message:
ScopeGuard as initially described by Alexandrescu and Marginean copies the callback function parameters to the guard implementation.  This means that the callback is called with the values given when make_guard gets called--not whatever the values might be when execution in the scope completes.

This changes OpenVRML's implementation of ScopeGuard to keep const references to the parameters in the guard implementation.  Also, use of boost::multi_index::detail::scope_guard (where use of OpenVRML's ScopeGuard implementation is inconvenient) now explicitly gives a reference template parameter to the instantiation of make_guard to circumvent this problem.

Index: private.h
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/private.h,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -C2 -d -r1.11.2.1 -r1.11.2.2
*** private.h	23 Oct 2006 06:39:17 -0000	1.11.2.1
--- private.h	2 Jan 2007 00:07:29 -0000	1.11.2.2
***************
*** 191,195 ****
          class OPENVRML_LOCAL scope_guard_impl1 : public scope_guard_impl_base {
              Function function;
!             const Param param;
  
          public:
--- 191,195 ----
          class OPENVRML_LOCAL scope_guard_impl1 : public scope_guard_impl_base {
              Function function;
!             const Param & param;
  
          public:
***************
*** 224,230 ****
          class OPENVRML_LOCAL scope_guard_impl3 : public scope_guard_impl_base {
              Function function;
!             const Param1 param1;
!             const Param2 param2;
!             const Param3 param3;
  
          public:
--- 224,230 ----
          class OPENVRML_LOCAL scope_guard_impl3 : public scope_guard_impl_base {
              Function function;
!             const Param1 & param1;
!             const Param2 & param2;
!             const Param3 & param3;
  
          public:
***************
*** 315,319 ****
              Object & obj;
              MemberFunction mem_fun;
!             const Param param;
  
          public:
--- 315,319 ----
              Object & obj;
              MemberFunction mem_fun;
!             const Param & param;
  
          public:

[openvrml-commit] openvrml/src/libopenvrml/openvrml script.cpp, 1.78, 1.79

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17885/src/libopenvrml/openvrml

Modified Files:
	script.cpp 
Log Message:
Fixed SFRotation axis normalization checks in the Script node JavaScript binding.

Index: script.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/script.cpp,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** script.cpp	31 Aug 2006 06:45:31 -0000	1.78
--- script.cpp	1 Jan 2007 21:25:45 -0000	1.79
***************
*** 5621,5624 ****
--- 5621,5629 ----
  }
  
+ OPENVRML_LOCAL bool normalized(const openvrml::vec3f & v)
+ {
+     return openvrml_::fequal(v.length(), 1.0f);
+ }
+ 
  JSBool SFRotation::initObject(JSContext * const cx,
                                JSObject * const obj,
***************
*** 5627,5631 ****
  {
      const openvrml::vec3f axis = openvrml::make_vec3f(rot[0], rot[1], rot[2]);
!     if (axis != axis.normalize()) {
          JS_ReportError(cx, "axis component of rotation is not normalized");
      }
--- 5632,5636 ----
  {
      const openvrml::vec3f axis = openvrml::make_vec3f(rot[0], rot[1], rot[2]);
!     if (!normalized(axis)) {
          JS_ReportError(cx, "axis component of rotation is not normalized");
      }
***************
*** 5710,5714 ****
          }
  
!         if (axis != axis.normalize()) {
              JS_ReportError(cx, "axis component of rotation is not normalized");
              return JS_FALSE;
--- 5715,5719 ----
          }
  
!         if (!normalized(axis)) {
              JS_ReportError(cx, "axis component of rotation is not normalized");
              return JS_FALSE;
***************
*** 5913,5917 ****
              &arg_sfdata.field_value());
  
!     if (argVec.value() != argVec.value().normalize()) {
          JS_ReportError(cx, "axis component of rotation is not normalized");
          return JS_FALSE;
--- 5918,5922 ----
              &arg_sfdata.field_value());
  
!     if (!normalized(argVec.value())) {
          JS_ReportError(cx, "axis component of rotation is not normalized");
          return JS_FALSE;

[openvrml-commit] openvrml ChangeLog,1.1404,1.1405

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17885

Modified Files:
	ChangeLog 
Log Message:
Fixed SFRotation axis normalization checks in the Script node JavaScript binding.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1404
retrieving revision 1.1405
diff -C2 -d -r1.1404 -r1.1405
*** ChangeLog	1 Jan 2007 07:12:44 -0000	1.1404
--- ChangeLog	1 Jan 2007 21:25:45 -0000	1.1405
***************
*** 1,4 ****
--- 1,18 ----
  2007-01-01 Braden McDaniel  <br...@en...>
  
+ 	Fixed SFRotation axis normalization checks in the Script node
+ 	JavaScript binding.
+ 
+ 	* src/libopenvrml/openvrml/script.cpp
+ 	(normalized(const openvrml::vec3f &)): Added convenience function.
+ 	(SFRotation::initObject(JSContext *, JSObject *, const
+ 	jsdouble (&)[4])): Fixed check to see if axis is normalized.
+ 	(SFRotation::setProperty(JSContext *, JSObject *, jsval, jsval*)):
+ 	Fixed check to see if axis is normalized.
+ 	(SFRotation::setAxis(JSContext *, JSObject *, uintN, jsval *,
+ 	jsval *)): Fixed check to see if axis is normalized.
+ 
+ 2007-01-01 Braden McDaniel  <br...@en...>
+ 
  	* doc/doxygen-footer: Added Google Analytics tracking scripts.
  

[openvrml-commit] openvrml/src/libopenvrml/openvrml script.cpp, 1.77, 1.77.2.1

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17861/src/libopenvrml/openvrml

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	script.cpp 
Log Message:
Fixed SFRotation axis normalization checks in the Script node JavaScript binding.

Index: script.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/openvrml/script.cpp,v
retrieving revision 1.77
retrieving revision 1.77.2.1
diff -C2 -d -r1.77 -r1.77.2.1
*** script.cpp	6 Aug 2006 06:45:24 -0000	1.77
--- script.cpp	1 Jan 2007 21:25:20 -0000	1.77.2.1
***************
*** 5621,5624 ****
--- 5621,5629 ----
  }
  
+ OPENVRML_LOCAL bool normalized(const openvrml::vec3f & v)
+ {
+     return openvrml_::fequal(v.length(), 1.0f);
+ }
+ 
  JSBool SFRotation::initObject(JSContext * const cx,
                                JSObject * const obj,
***************
*** 5627,5631 ****
  {
      const openvrml::vec3f axis(rot[0], rot[1], rot[2]);
!     if (axis != axis.normalize()) {
          JS_ReportError(cx, "axis component of rotation is not normalized");
      }
--- 5632,5636 ----
  {
      const openvrml::vec3f axis(rot[0], rot[1], rot[2]);
!     if (!normalized(axis)) {
          JS_ReportError(cx, "axis component of rotation is not normalized");
      }
***************
*** 5712,5716 ****
          }
  
!         if (axis != axis.normalize()) {
              JS_ReportError(cx, "axis component of rotation is not normalized");
              return JS_FALSE;
--- 5717,5721 ----
          }
  
!         if (!normalized(axis)) {
              JS_ReportError(cx, "axis component of rotation is not normalized");
              return JS_FALSE;
***************
*** 5915,5919 ****
              &arg_sfdata.field_value());
  
!     if (argVec.value() != argVec.value().normalize()) {
          JS_ReportError(cx, "axis component of rotation is not normalized");
          return JS_FALSE;
--- 5920,5924 ----
              &arg_sfdata.field_value());
  
!     if (!normalized(argVec.value())) {
          JS_ReportError(cx, "axis component of rotation is not normalized");
          return JS_FALSE;

[openvrml-commit] openvrml ChangeLog,1.1310.2.81,1.1310.2.82

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv17861

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	ChangeLog 
Log Message:
Fixed SFRotation axis normalization checks in the Script node JavaScript binding.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1310.2.81
retrieving revision 1.1310.2.82
diff -C2 -d -r1.1310.2.81 -r1.1310.2.82
*** ChangeLog	1 Jan 2007 07:12:29 -0000	1.1310.2.81
--- ChangeLog	1 Jan 2007 21:25:20 -0000	1.1310.2.82
***************
*** 1,4 ****
--- 1,18 ----
  2007-01-01 Braden McDaniel  <br...@en...>
  
+ 	Fixed SFRotation axis normalization checks in the Script node
+ 	JavaScript binding.
+ 
+ 	* src/libopenvrml/openvrml/script.cpp
+ 	(normalized(const openvrml::vec3f &)): Added convenience function.
+ 	(SFRotation::initObject(JSContext *, JSObject *, const
+ 	jsdouble (&)[4])): Fixed check to see if axis is normalized.
+ 	(SFRotation::setProperty(JSContext *, JSObject *, jsval, jsval*)):
+ 	Fixed check to see if axis is normalized.
+ 	(SFRotation::setAxis(JSContext *, JSObject *, uintN, jsval *,
+ 	jsval *)): Fixed check to see if axis is normalized.
+ 
+ 2007-01-01 Braden McDaniel  <br...@en...>
+ 
  	* doc/doxygen-footer: Added Google Analytics tracking scripts.
  

[openvrml-commit] openvrml/doc doxygen-footer,1.3,1.4

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/doc
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10691/doc

Modified Files:
	doxygen-footer 
Log Message:
Added Google Analytics tracking scripts.

Index: doxygen-footer
===================================================================
RCS file: /cvsroot/openvrml/openvrml/doc/doxygen-footer,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** doxygen-footer	17 Dec 2002 07:22:29 -0000	1.3
--- doxygen-footer	1 Jan 2007 07:12:44 -0000	1.4
***************
*** 1,4 ****
--- 1,6 ----
  </div>
  <address class="footer"><a href="http://sourceforge.net"><img src="http://sourceforge.net/sflogo.php?group_id=7151&amp;type=3" width="125" height="37" border="0" alt="SourceForge.net Logo" align="right"></a><a href="http://sourceforge.net/tracker/?func=add&amp;group_id=7151&amp;atid=107151">Report error</a><br>Generated $datetime by Doxygen $doxygenversion</address>
+ <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+ <script type="text/javascript">_uacct = "UA-446379-2"; urchinTracker();</script>
  </body>
  </html>

[openvrml-commit] openvrml ChangeLog,1.1403,1.1404

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10691

Modified Files:
	ChangeLog 
Log Message:
Added Google Analytics tracking scripts.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1403
retrieving revision 1.1404
diff -C2 -d -r1.1403 -r1.1404
*** ChangeLog	30 Dec 2006 23:37:43 -0000	1.1403
--- ChangeLog	1 Jan 2007 07:12:44 -0000	1.1404
***************
*** 1,2 ****
--- 1,6 ----
+ 2007-01-01 Braden McDaniel  <br...@en...>
+ 
+ 	* doc/doxygen-footer: Added Google Analytics tracking scripts.
+ 
  2006-12-30 Braden McDaniel  <br...@en...>
  

[openvrml-commit] openvrml/doc doxygen-footer,1.3,1.3.8.1

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/doc
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10668/doc

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	doxygen-footer 
Log Message:
Added Google Analytics tracking scripts.

Index: doxygen-footer
===================================================================
RCS file: /cvsroot/openvrml/openvrml/doc/doxygen-footer,v
retrieving revision 1.3
retrieving revision 1.3.8.1
diff -C2 -d -r1.3 -r1.3.8.1
*** doxygen-footer	17 Dec 2002 07:22:29 -0000	1.3
--- doxygen-footer	1 Jan 2007 07:12:29 -0000	1.3.8.1
***************
*** 1,4 ****
--- 1,6 ----
  </div>
  <address class="footer"><a href="http://sourceforge.net"><img src="http://sourceforge.net/sflogo.php?group_id=7151&amp;type=3" width="125" height="37" border="0" alt="SourceForge.net Logo" align="right"></a><a href="http://sourceforge.net/tracker/?func=add&amp;group_id=7151&amp;atid=107151">Report error</a><br>Generated $datetime by Doxygen $doxygenversion</address>
+ <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+ <script type="text/javascript">_uacct = "UA-446379-2"; urchinTracker();</script>
  </body>
  </html>

[openvrml-commit] openvrml ChangeLog,1.1310.2.80,1.1310.2.81

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv10668

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	ChangeLog 
Log Message:
Added Google Analytics tracking scripts.

Index: ChangeLog
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ChangeLog,v
retrieving revision 1.1310.2.80
retrieving revision 1.1310.2.81
diff -C2 -d -r1.1310.2.80 -r1.1310.2.81
*** ChangeLog	30 Dec 2006 23:37:05 -0000	1.1310.2.80
--- ChangeLog	1 Jan 2007 07:12:29 -0000	1.1310.2.81
***************
*** 1,2 ****
--- 1,6 ----
+ 2007-01-01 Braden McDaniel  <br...@en...>
+ 
+ 	* doc/doxygen-footer: Added Google Analytics tracking scripts.
+ 
  2006-12-30 Braden McDaniel  <br...@en...>
  

[openvrml-commit] htdocs/screenshots index.html,1.5,1.6

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/htdocs/screenshots
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9284/screenshots

Modified Files:
	index.html 
Log Message:
Added Google Analytics tracking scripts.

Index: index.html
===================================================================
RCS file: /cvsroot/openvrml/htdocs/screenshots/index.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** index.html	30 Nov 2006 23:35:09 -0000	1.5
--- index.html	31 Dec 2006 03:11:36 -0000	1.6
***************
*** 47,50 ****
--- 47,52 ----
      </div>
      <address class="footer"><a href="http://sourceforge.net"><img src="http://sourceforge.net/sflogo.php?group_id=7151&type=3" width="125" height="37" border="0" alt="SourceForge.net Logo" align="right"></a><a href="mailto:br...@us...">Contact Webmaster</a></address>
+     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+     <script type="text/javascript">_uacct = "UA-446379-2"; urchinTracker();</script>
    </body>
  </html>

[openvrml-commit] htdocs discussion.html, 1.5, 1.6 download.html, 1.6, 1.7 index.php, 1.33, 1.34

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/htdocs
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv9284

Modified Files:
	discussion.html download.html index.php 
Log Message:
Added Google Analytics tracking scripts.

Index: download.html
===================================================================
RCS file: /cvsroot/openvrml/htdocs/download.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** download.html	30 Nov 2006 23:35:09 -0000	1.6
--- download.html	31 Dec 2006 03:11:36 -0000	1.7
***************
*** 35,38 ****
--- 35,40 ----
      </div>
      <address class="footer"><a href="http://sourceforge.net"><img src="http://sourceforge.net/sflogo.php?group_id=7151&type=3" width="125" height="37" border="0" alt="SourceForge.net Logo" align="right"></a><a href="mailto:br...@us...">Contact Webmaster</a></address>
+     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+     <script type="text/javascript">_uacct = "UA-446379-2"; urchinTracker();</script>
    </body>
  </html>

Index: discussion.html
===================================================================
RCS file: /cvsroot/openvrml/htdocs/discussion.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** discussion.html	30 Nov 2006 23:35:09 -0000	1.5
--- discussion.html	31 Dec 2006 03:11:36 -0000	1.6
***************
*** 38,41 ****
--- 38,43 ----
      </div>
      <address class="footer"><a href="http://sourceforge.net"><img src="http://sourceforge.net/sflogo.php?group_id=7151&type=3" width="125" height="37" border="0" alt="SourceForge.net Logo" align="right"></a><a href="mailto:br...@us...">Contact Webmaster</a></address>
+     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+     <script type="text/javascript">_uacct = "UA-446379-2"; urchinTracker();</script>
    </body>
  </html>

Index: index.php
===================================================================
RCS file: /cvsroot/openvrml/htdocs/index.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** index.php	30 Nov 2006 23:35:09 -0000	1.33
--- index.php	31 Dec 2006 03:11:36 -0000	1.34
***************
*** 78,81 ****
--- 78,83 ----
      </div>
      <address class="footer"><a href="http://sourceforge.net"><img src="http://sourceforge.net/sflogo.php?group_id=7151&type=3" width="125" height="37" border="0" alt="SourceForge.net Logo" align="right"></a><a href="mailto:br...@us...">Contact Webmaster</a></address>
+     <script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+     <script type="text/javascript">_uacct = "UA-446379-2"; urchinTracker();</script>
    </body>
  </html>

[openvrml-commit] openvrml/src/libopenvrml-gl Makefile.am,1.7,1.8

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/src/libopenvrml-gl
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22542/src/libopenvrml-gl

Modified Files:
	Makefile.am 
Log Message:
Updates for the 0.16.3 release.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml-gl/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile.am	28 Oct 2006 07:08:59 -0000	1.7
--- Makefile.am	30 Dec 2006 23:37:44 -0000	1.8
***************
*** 1,3 ****
! LIBRARY_VERSION = 6:3:0
  #                 | | |
  #          +------+ | +---+
--- 1,3 ----
! LIBRARY_VERSION = 6:4:0
  #                 | | |
  #          +------+ | +---+

[openvrml-commit] openvrml/src/libopenvrml Makefile.am,1.39,1.40

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/src/libopenvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22542/src/libopenvrml

Modified Files:
	Makefile.am 
Log Message:
Updates for the 0.16.3 release.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml/Makefile.am,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** Makefile.am	29 Nov 2006 19:04:49 -0000	1.39
--- Makefile.am	30 Dec 2006 23:37:44 -0000	1.40
***************
*** 63,67 ****
          $(X3DVRMLPARSER_BUILT_SOURCEFILES)
  
! LIBRARY_VERSION = 7:1:1
  #                 | | |
  #          +------+ | +---+
--- 63,67 ----
          $(X3DVRMLPARSER_BUILT_SOURCEFILES)
  
! LIBRARY_VERSION = 7:2:1
  #                 | | |
  #          +------+ | +---+

[openvrml-commit] openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml openvrml.rc, 1.4, 1.5 openvrml.vcproj, 1.9, 1.10

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22542/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml

Modified Files:
	openvrml.rc openvrml.vcproj 
Log Message:
Updates for the 0.16.3 release.

Index: openvrml.vcproj
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml/openvrml.vcproj,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** openvrml.vcproj	29 Nov 2006 19:04:48 -0000	1.9
--- openvrml.vcproj	30 Dec 2006 23:37:44 -0000	1.10
***************
*** 43,47 ****
  				Optimization="0"
  				AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\lib\antlr"
! 				PreprocessorDefinitions="WIN32;NOMINMAX;BOOST_SPIRIT_THREADSAFE;PACKAGE_VERSION=\"0.16.2\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL"
  				MinimalRebuild="true"
  				BasicRuntimeChecks="0"
--- 43,47 ----
  				Optimization="0"
  				AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\lib\antlr"
! 				PreprocessorDefinitions="WIN32;NOMINMAX;BOOST_SPIRIT_THREADSAFE;PACKAGE_VERSION=\"0.16.3\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL"
  				MinimalRebuild="true"
  				BasicRuntimeChecks="0"
***************
*** 127,131 ****
  				WholeProgramOptimization="true"
  				AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\lib\antlr"
! 				PreprocessorDefinitions="WIN32;NOMINMAX;BOOST_SPIRIT_THREADSAFE;NDEBUG;PACKAGE_VERSION=\"0.16.2\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL"
  				StringPooling="true"
  				RuntimeLibrary="2"
--- 127,131 ----
  				WholeProgramOptimization="true"
  				AdditionalIncludeDirectories=".;..\..\..\..\..\src\libopenvrml;..\..\..\..\..\lib\antlr"
! 				PreprocessorDefinitions="WIN32;NOMINMAX;BOOST_SPIRIT_THREADSAFE;NDEBUG;PACKAGE_VERSION=\"0.16.3\";BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS;BOOST_MPL_LIMIT_VECTOR_SIZE=30;OPENVRML_BUILD_DLL"
  				StringPooling="true"
  				RuntimeLibrary="2"

Index: openvrml.rc
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml/openvrml.rc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** openvrml.rc	29 Nov 2006 19:04:48 -0000	1.4
--- openvrml.rc	30 Dec 2006 23:37:43 -0000	1.5
***************
*** 54,59 ****
  
  VS_VERSION_INFO VERSIONINFO
!  FILEVERSION 7,1,1,0
!  PRODUCTVERSION 0,16,2,0
   FILEFLAGSMASK 0x17L
  #ifdef _DEBUG
--- 54,59 ----
  
  VS_VERSION_INFO VERSIONINFO
!  FILEVERSION 7,2,1,0
!  PRODUCTVERSION 0,16,3,0
   FILEFLAGSMASK 0x17L
  #ifdef _DEBUG
***************
*** 71,80 ****
          BEGIN
              VALUE "FileDescription", "OpenVRML Library"
!             VALUE "FileVersion", "7, 1, 1, 0"
              VALUE "InternalName", "openvrml"
              VALUE "LegalCopyright", "Copyright (C) 2006"
              VALUE "OriginalFilename", "openvrml.dll"
              VALUE "ProductName", "OpenVRML Library"
!             VALUE "ProductVersion", "0.16.2"
          END
      END
--- 71,80 ----
          BEGIN
              VALUE "FileDescription", "OpenVRML Library"
!             VALUE "FileVersion", "7, 2, 1, 0"
              VALUE "InternalName", "openvrml"
              VALUE "LegalCopyright", "Copyright (C) 2006"
              VALUE "OriginalFilename", "openvrml.dll"
              VALUE "ProductName", "OpenVRML Library"
!             VALUE "ProductVersion", "0.16.3"
          END
      END

[openvrml-commit] openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl openvrml-gl.rc, 1.4, 1.5

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22542/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl

Modified Files:
	openvrml-gl.rc 
Log Message:
Updates for the 0.16.3 release.

Index: openvrml-gl.rc
===================================================================
RCS file: /cvsroot/openvrml/openvrml/ide-projects/Windows/VisualC8_0/OpenVRML/openvrml-gl/openvrml-gl.rc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** openvrml-gl.rc	29 Nov 2006 19:04:49 -0000	1.4
--- openvrml-gl.rc	30 Dec 2006 23:37:44 -0000	1.5
***************
*** 54,59 ****
  
  VS_VERSION_INFO VERSIONINFO
!  FILEVERSION 6,3,0,0
!  PRODUCTVERSION 0,16,2,0
   FILEFLAGSMASK 0x17L
  #ifdef _DEBUG
--- 54,59 ----
  
  VS_VERSION_INFO VERSIONINFO
!  FILEVERSION 6,4,0,0
!  PRODUCTVERSION 0,16,3,0
   FILEFLAGSMASK 0x17L
  #ifdef _DEBUG
***************
*** 71,80 ****
          BEGIN
              VALUE "FileDescription", "OpenVRML OpenGL Renderer Library"
!             VALUE "FileVersion", "6, 3, 0, 0"
              VALUE "InternalName", "openvrml-gl"
              VALUE "LegalCopyright", "Copyright (C) 2006"
              VALUE "OriginalFilename", "openvrml-gl.dll"
              VALUE "ProductName", "OpenVRML Library"
!             VALUE "ProductVersion", "0.16.2"
          END
      END
--- 71,80 ----
          BEGIN
              VALUE "FileDescription", "OpenVRML OpenGL Renderer Library"
!             VALUE "FileVersion", "6, 4, 0, 0"
              VALUE "InternalName", "openvrml-gl"
              VALUE "LegalCopyright", "Copyright (C) 2006"
              VALUE "OriginalFilename", "openvrml-gl.dll"
              VALUE "ProductName", "OpenVRML Library"
!             VALUE "ProductVersion", "0.16.3"
          END
      END

[openvrml-commit] openvrml/mozilla-plugin configure.ac,1.19,1.20

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/mozilla-plugin
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22542/mozilla-plugin

Modified Files:
	configure.ac 
Log Message:
Updates for the 0.16.3 release.

Index: configure.ac
===================================================================
RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/configure.ac,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** configure.ac	29 Nov 2006 19:04:49 -0000	1.19
--- configure.ac	30 Dec 2006 23:37:44 -0000	1.20
***************
*** 1,4 ****
  AC_PREREQ([2.53])
! AC_INIT([OpenVRML Mozilla Plugin], [0.16.2],
          [ope...@li...])
  AC_COPYRIGHT([Portions copyright 2004, 2005, 2006 Braden McDaniel])
--- 1,4 ----
  AC_PREREQ([2.53])
! AC_INIT([OpenVRML Mozilla Plugin], [0.16.3],
          [ope...@li...])
  AC_COPYRIGHT([Portions copyright 2004, 2005, 2006 Braden McDaniel])