From 142af15270883f61c831b7711f7fa1f3f7f4cb3a Mon Sep 17 00:00:00 2001
From: Sylvain Thery <thery@unistra.fr>
Date: Wed, 11 Feb 2015 15:11:11 +0100
Subject: [PATCH] remove some warnings

---
 CGoGN/src/Algo/Import/ply.c  |  8 ++---
 CGoGN/src/Utils/compress.cpp |  2 ++
 ThirdParty/CMakeLists.txt    | 63 ------------------------------------
 ThirdParty/README.TXT        | 17 ----------
 4 files changed, 6 insertions(+), 84 deletions(-)
 delete mode 100644 ThirdParty/CMakeLists.txt
 delete mode 100644 ThirdParty/README.TXT

diff --git a/CGoGN/src/Algo/Import/ply.c b/CGoGN/src/Algo/Import/ply.c
index 9797207d6..84728bec8 100644
--- a/CGoGN/src/Algo/Import/ply.c
+++ b/CGoGN/src/Algo/Import/ply.c
@@ -618,7 +618,7 @@ PlyFile *ply_read(FILE *fp, int *nelems, char ***elem_names)
   PlyFile *plyfile;
   int nwords;
   char **words;
-  int found_format = 0;
+//  int found_format = 0;
   char **elist;
   PlyElement *elem;
   char *orig_line;
@@ -661,7 +661,7 @@ PlyFile *ply_read(FILE *fp, int *nelems, char ***elem_names)
       else
         return (NULL);
       plyfile->version = (float) atof (words[2]);
-      found_format = 1;
+//      found_format = 1;
     }
     else if (equal_strings (words[0], "element"))
       add_element (plyfile, words, nwords);
@@ -1433,7 +1433,7 @@ void ascii_get_element(PlyFile *plyfile, char *elem_ptr)
   int store_it;
   char **store_array;
   char *orig_line;
-  char *other_data;
+  char *other_data=NULL;
   int other_flag;
 
   /* the kind of element we're reading currently */
@@ -1566,7 +1566,7 @@ void binary_get_element(PlyFile *plyfile, char *elem_ptr)
   int list_count;
   int store_it;
   char **store_array;
-  char *other_data;
+  char *other_data=NULL;
   int other_flag;
 
   /* the kind of element we're reading currently */
diff --git a/CGoGN/src/Utils/compress.cpp b/CGoGN/src/Utils/compress.cpp
index e4ed4fa79..aa2aaab0a 100644
--- a/CGoGN/src/Utils/compress.cpp
+++ b/CGoGN/src/Utils/compress.cpp
@@ -51,6 +51,8 @@ void zlibVTUWriteCompressed( unsigned char* input, unsigned int nbBytes, std::of
 	strm.opaque = Z_NULL;
 	int ret = deflateInit(&strm, level);
 	assert(ret == Z_OK); 
+	if (ret != Z_OK)
+		return;
 
 	unsigned char* bufferOut = new unsigned char[nbBytes];
 	unsigned char* ptrBufferOut = bufferOut;
diff --git a/ThirdParty/CMakeLists.txt b/ThirdParty/CMakeLists.txt
deleted file mode 100644
index 78e2e8f73..000000000
--- a/ThirdParty/CMakeLists.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-project(CGoGN_ThirdParty)
-#cmake_policy(SET CMP0042 NEW) # rpath new policy
-
-SET(CGoGN_ROOT_DIR ${CMAKE_SOURCE_DIR}/..)
-
-
-IF (${CMAKE_CURRENT_BINARY_DIR} MATCHES "(.*)Debug")
-	set(CMAKE_BUILD_TYPE "Debug" CACHE STRING "Debug/Release" FORCE)
-ELSE()
-	set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Debug/Release" FORCE)	
-ENDIF()
-
-IF(WIN32)
-	set(CMAKE_PREFIX_PATH ${CGoGN_ROOT_DIR}/windows_dependencies CACHE STRING "path to dependencies")
-	INCLUDE_DIRECTORIES(${CGoGN_ROOT_DIR}/windows_dependencies/include/)
-	INCLUDE_DIRECTORIES(${CGoGN_ROOT_DIR}/windows_dependencies/include/suitesparse)
-	SET(LIBRARY_OUTPUT_PATH ${CGoGN_ROOT_DIR}/lib)
-	set(CMAKE_CONFIGURATION_TYPES Release Debug)
-	SET (BUILD_SHARED_LIBS OFF CACHE BOOL "if used all library are build as shared type (.so/.dylib/.dll)")
-ELSE()
-	SET(LIBRARY_OUTPUT_PATH ${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE})
-	SET (BUILD_SHARED_LIBS ON CACHE BOOL "if used all library are build as shared type (.so/.dylib/.dll)")
-ENDIF()
-
-
-# for shared or not shared
-
-SET (WITH_ASSIMP OFF CACHE BOOL "build with Assimp")
-SET (WITH_ZINRI ON CACHE BOOL "build with Zinri libs")
-SET (WITH_PYTHONQT ON CACHE BOOL "build PythonQt (for Schnapps)")
-
-IF (APPLE)
-	SET(CMAKE_OSX_ARCHITECTURES x86_64)
-ENDIF(APPLE)
-
-add_subdirectory(Tools Tools/build)
-
-IF (WITH_PYTHONQT)
-	add_subdirectory(PythonQt PythonQt/build)
-	INSTALL (DIRECTORY PythonQt/src/ DESTINATION ${CGoGN_ROOT_DIR}/ThirdParty/include/PythonQt FILES_MATCHING PATTERN "*.h")
-ENDIF (WITH_PYTHONQT)
-
-add_subdirectory(OpenNL OpenNL/build)
-INSTALL (DIRECTORY OpenNL/src/NL/ DESTINATION ${CGoGN_ROOT_DIR}/ThirdParty/include/NL FILES_MATCHING PATTERN "*.h")
-
-add_subdirectory(tetgen tetgen/build)
-INSTALL (DIRECTORY tetgen/ DESTINATION ${CGoGN_ROOT_DIR}/ThirdParty/include/tetgen FILES_MATCHING PATTERN "*.h")
-
-IF (WITH_ZINRI)
-	add_subdirectory(Zinri Zinri/build)
-	INSTALL (DIRECTORY Zinri/ DESTINATION ${CGoGN_ROOT_DIR}/ThirdParty/include/Zinri FILES_MATCHING PATTERN "*.h")
-ENDIF(WITH_ZINRI)
-
-IF (WITH_ASSIMP)
-	add_subdirectory(Assimp Assimp/build)
-	INSTALL (DIRECTORY Assimp/include/ DESTINATION ${CGoGN_ROOT_DIR}/ThirdParty/include/Assimp)
-ENDIF (WITH_ASSIMP)
-
-add_subdirectory(TinyXml2 TinyXml2/build)
-INSTALL (DIRECTORY TinyXml2/ DESTINATION ${CGoGN_ROOT_DIR}/ThirdParty/include/TinyXml2 FILES_MATCHING PATTERN "*.h")
-
diff --git a/ThirdParty/README.TXT b/ThirdParty/README.TXT
deleted file mode 100644
index 430ac6234..000000000
--- a/ThirdParty/README.TXT
+++ /dev/null
@@ -1,17 +0,0 @@
-Zinri: lecture/ecriture de fichier inr.gz (image3D inria)
-Assimp: import de nombreux type de fichiers 3D (maillages)
-
-Compilation:
-============
-cd build (pour compiler en release)
-ou cd buildDebug (pour compiler en Debug)
-
-"cmake .." ou "ccmake .." ou "cmake-gui .."
-
-options (et valeur par defaut)
-	BUILD_SHARED_LIBS  (F)                                                                                                                                                           
-	WITH_ASSIMP        (T)
-	WITH_ZINRI         (T)
-
-"make"
-"make install"
-- 
GitLab