Minor corrections:

- CMakeLists.txt: installation of TclTk fixed so that tests can be run
- StdPrs: compiler warning introduced by fix on #23474 corrected
- Documentation: description of insertion of images into markdown document corrected

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60fbdf2a6c603667c9e1330c0ea13e963eb3826a..1ca586192cbb63ba58c3305fb17cd36942d78f04 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -317,6 +317,7 @@ IF(INSTALL_TCL)
   INSTALL(FILES "${3RDPARTY_TCL_DLL_DIR}/${DLL_SO_PREFIX}tk${TCL_VERSION}.${DLL_SO}" DESTINATION "${INSTALL_DIR}/${DLL_SO_FOLDER}")
   
   IF (IS_TCL_VERSION_FOUND)
+    INSTALL(DIRECTORY "${3RDPARTY_TCL_LIB_DIR}/tcl8" DESTINATION "${INSTALL_DIR}/lib")
     INSTALL(DIRECTORY "${3RDPARTY_TCL_LIB_DIR}/tcl${TCL_FOLDER_VERSION}" DESTINATION "${INSTALL_DIR}/lib")
     INSTALL(DIRECTORY "${3RDPARTY_TCL_LIB_DIR}/tk${TCL_FOLDER_VERSION}" DESTINATION "${INSTALL_DIR}/lib")
   ELSE()

diff --git a/dox/dev_guides/documentation/documentation.md b/dox/dev_guides/documentation/documentation.md
index c31d05fa2a47861b7d3d963b39cc444edd7619a5..da2141e3a5cf7c37b117640f26ed523d220c7cc6 100644 (file)
--- a/dox/dev_guides/documentation/documentation.md
+++ b/dox/dev_guides/documentation/documentation.md
@@ -361,20 +361,19 @@ For highlighting according to the C++ language, for instance,  write the followi
 
 @verbatim
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp}
-    int func(int a,int b) { return a*b; }
+int func(int a,int b) { return a*b; }
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 @endverbatim
 
 which will produce:
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~{.cpp} 
-    int func(int a,int b) { return a*b; }
+int func(int a,int b) { return a*b; }
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Verbatim content can be written by using framing \@verbatim \@endverbatim . For instance
 
-@verbatim
-  verbatim text
-@endverbatim
+    verbatim text
+
 
 @subsection  OCCT_DM_SECTION_A_6 References
 
@@ -392,16 +391,32 @@ to get a link to paragraph : @htmlonly <a href="#OCCT_DOC_SECTION_5">Doxygen con
 @subsection  OCCT_DM_SECTION_A_7 Images
 
 To insert image into document the developer can write the following code(in Doxygen-style):
+
+For HTML document:
+@verbatim
+  @image html /relative/path/to/image/image001.png "Image caption"
+@endverbatim
+
+For latex document:
+@verbatim
+  @image latex /relative/path/to/image/image001.png "Image caption"
+@endverbatim
+
+*Note*: When markdown document is used to generate html document the latex insertion is ignored (and vice versa) 
+due to this fact you can use image insertions in the pair, like example below:
 @verbatim
-![alt-caption](relative/path/to/image/image001.svg "Image Caption")
+  @image html /relative/path/to/image/image001.png "Image caption"
+  @image latex /relative/path/to/image/image001.png "Image caption"
 @endverbatim
 
-This code tells Doxygen to insert a picture right in the place this code was written. Like this:
+The code below tells Doxygen to insert a picture right in the place this code was written:
 @verbatim
-![](/resources/occ_logo.png "OCCT logo")
+  @image html /resources/occ_logo.png "OCCT logo"
+  @image latex /resources/occ_logo.png "OCCT logo"
 @endverbatim
 
-![](/resources/occ_logo.png "OCCT logo")
+@image html /resources/occ_logo.png "OCCT logo"
+@image latex /resources/occ_logo.png "OCCT logo"
  
 @subsection  OCCT_DM_SECTION_A_8 Table Of Contents
 

diff --git a/src/StdPrs/StdPrs_ShadedShape.cxx b/src/StdPrs/StdPrs_ShadedShape.cxx
index 11b430fd3fd7489667c08e3f377301ad6d4f77be..dbc2a995f02d41600612b942469744f89074ad11 100644 (file)
--- a/src/StdPrs/StdPrs_ShadedShape.cxx
+++ b/src/StdPrs/StdPrs_ShadedShape.cxx
@@ -328,7 +328,7 @@ namespace
     Handle(Graphic3d_AspectLine3d) aBoundaryAspect = 
       theDrawer->FaceBoundaryAspect ()->Aspect ();
 
-    Handle(Graphic3d_Group) & aPrsGrp = Prs3d_Root::CurrentGroup (thePresentation);
+    Handle(Graphic3d_Group) aPrsGrp = Prs3d_Root::CurrentGroup (thePresentation);
     aPrsGrp->SetGroupPrimitivesAspect (aBoundaryAspect);
     aPrsGrp->AddPrimitiveArray (aSegments);
   }