Commit ef65e7d7 authored by Andreas Tille's avatar Andreas Tille
Browse files

New upstream version 3.8.8

parent d6be7c04

.travis.yml

+2 −3
Original line number Diff line number Diff line 
sudo: required

dist: trusty

dist: xenial

language: generic



env:

  matrix: 

  - BUILD_TYPE=Release
@@ -12,7 +11,7 @@ env: 


install:

- sudo add-apt-repository ppa:gert-die/trusty-mia -y

- sudo add-apt-repository ppa:rebuntu16/avogadro+unofficial  -y

- sudo add-apt-repository ppa:gert-die/ginkgocadx-trusty -y

- sudo apt-get update -qq

- sudo apt-get install -y libvtk6-dev libinsighttoolkit4-dev libdcmtk-dev libcairo2-dev

  libcurl4-gnutls-dev libfftw3-dev libfreetype6-dev libgtk2.0-dev libjsoncpp-dev libmysqlclient-dev

CMakeLists.txt

+15 −11
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8) 


PROJECT(BUILD_ALL)



SET( GINKGO_VERSION 3.8.6)

SET( GINKGO_VERSION 3.8.8)



SET( USE_PATCHED_LIBS        FALSE CACHE BOOL "Use patched libraries")

SET( BUILD_VISUALIZATION_EXT TRUE CACHE BOOL "Build Visualization extention")
@@ -31,6 +31,8 @@ include(FindPkgConfig) 


include(CheckCXXCompilerFlag)



set(CMAKE_CXX_STANDARD_DEFAULT "")



IF (((${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") AND

      (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5.3.0)) OR

    ((${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") AND
@@ -38,15 +40,12 @@ IF (((${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU") AND 
  MESSAGE(STATUS "Compiler has full c++11 support")



  # g++ >= 6.0 sets std=c++14 by default

  IF (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")

    IF (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0.0)

      SET(CXX_11_FLAG "-std=c++11")

    ENDIF()

  ELSE()

    SET(CXX_11_FLAG "-std=c++11")

  IF (NOT ( ${CMAKE_CXX_COMPILER_ID}  STREQUAL "GNU") OR

      (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0.0))

    set(CMAKE_CXX_STANDARD 11)

    set(CMAKE_CXX_STANDARD_REQUIRED ON)

  ENDIF()



  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  ${CXX_11_FLAG}")

ELSE()

  CHECK_CXX_COMPILER_FLAG("-std=c++11" HAS_GNU_CXX11_FLAG)

  IF(HAS_GNU_CXX11_FLAG)
@@ -62,6 +61,7 @@ ELSE() 
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  ${CXX_11_FLAG}")

ENDIF()





#doesn't work... using custom build

#IF(LINUX)

#FIND_PACKAGE(LIBCURL REQUIRED)
@@ -93,7 +93,7 @@ SET_CUSTOM_ITK_PACKAGE() 
ENDIF()



IF(NOT USE_CUSTOM_DCMTK)

FIND_PACKAGE(DCMTK 3.6.1 REQUIRED)

FIND_PACKAGE(DCMTK 3.6.4 REQUIRED)

ELSE()

MESSAGE(STATUS "Using custom DCMTK")

SET_CUSTOM_DCMTK_PACKAGE()
@@ -135,7 +135,10 @@ INCLUDE_DIRECTORIES(${CAIRO_INCLUDE_DIRS}) 
LINK_DIRECTORIES(${CAIRO_LIBRARY_DIRS})



IF(LINUX)

  PKG_CHECK_MODULES(GTK REQUIRED gtk+-2.0)

  STRING(REGEX MATCH "gtk[23]" GTK_VERSION_SENTINEL "${wxWidgets_LIBRARIES}")

  STRING(REGEX REPLACE "gtk([23])" "gtk+-\\1.0" GTK_PKG_CONFIG_PACKAGE "${GTK_VERSION_SENTINEL}")



  PKG_CHECK_MODULES(GTK REQUIRED ${GTK_PKG_CONFIG_PACKAGE})

  INCLUDE_DIRECTORIES(${GTK_INCLUDE_DIRS})

  LINK_DIRECTORIES(${GTK_LIBRARY_DIRS})
@@ -187,3 +190,4 @@ SET( DEST "${CMAKE_CURRENT_BINARY_DIR}/dist" ) 
PACKAGE_RULES( "${PROJECT_NAME}" "${ARCH}" "${DEST}" )

ENDIF()



MESSAGE(STATUS "Using CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")

cadxcore/CMakeLists.txt

+0 −21
Original line number Diff line number Diff line
@@ -208,27 +208,6 @@ IF (MACOS) 
	LINK_DIRECTORIES(${XmlRpc++_DIR})

ENDIF()



IF (LINUX)

	IF (GTK2_FOUND)

	  INCLUDE_DIRECTORIES(${GTK2_INCLUDE_DIRS})

	ELSE ()

	  MESSAGE("-----------------GTK2 NOT FOUND--------------------")

	  INCLUDE_DIRECTORIES(/usr/include/gtk-2.0

	      /usr/include/atk-1.0

	      /usr/include/pango-1.0

	      /usr/include/gio-unix-2.0/

	      /usr/include/glib-2.0

	      /usr/lib/i386-linux-gnu/glib-2.0/include

	      /usr/include/freetype2

	      /usr/include/libpng12

	      /usr/lib/gtk-2.0/include

	      /usr/include/cairo

	      /usr/include/gdk-pixbuf-2.0

	      /usr/include/pixman-1

	  )  

	ENDIF ()

ENDIF()





################ TARGET ################

cadxcore/VTKInria3D/wxVTK/wxVTKRenderWindowInteractor.cpp

+3 −2
Original line number Diff line number Diff line
@@ -555,13 +555,14 @@ void wxVTKRenderWindowInteractor::OnSize(wxSizeEvent& /*event*/) 
                GtkWidget* parent_widget = GetParent()->GetHandle();

                if (parent_widget != NULL) {

                        gtk_widget_realize(parent_widget);

                        Window parent_wid = GDK_WINDOW_XWINDOW( parent_widget->window );

                        GdkWindow *window = gtk_widget_get_window(parent_widget);

                        Window parent_wid = GDK_WINDOW_XID(window);

                        RenderWindow->SetParentId(reinterpret_cast<void *>(parent_wid));

                } else {

                        RenderWindow->SetParentId(NULL);

                }

                gtk_widget_realize(widget);

                Window wid = GDK_WINDOW_XWINDOW( widget->window );

                Window wid = GDK_WINDOW_XID( gtk_widget_get_window(widget) );

                RenderWindow->SetWindowId(reinterpret_cast<void *>(wid));



                SetCurrent(*GLContext);

cadxcore/main/controllers/dcmtk/dicomassociation.cpp

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ OFCondition Association::SendObject(DcmDataset *dataset) 
        T_DIMSE_C_StoreRSP rsp;



        // check if we SOPClass and SOPInstance in dataset

        if (!DU_findSOPClassAndInstanceInDataSet(dataset, sopClass, sopInstance)) {

        if (!DU_findSOPClassAndInstanceInDataSet(dataset, sopClass, sizeof(sopClass), sopInstance, sizeof(sopInstance))) {

                return makeOFCondition(OFM_dcmnet, DIMSEC_BADDATA, OF_error, "No SOPClass or SOPInstanceUID found on dataset");

        }