From a6fda82e65151e282fb5d6ef06a3fa5bebade64c Mon Sep 17 00:00:00 2001 From: Packit Service Date: Dec 09 2020 09:14:49 +0000 Subject: Prepare for a new update Reverting patches so we can apply the latest update and changes can be seen in the spec file and sources. --- diff --git a/cmake/FindGflags.cmake b/cmake/FindGflags.cmake index 6ac3fdb..32c04ea 100644 --- a/cmake/FindGflags.cmake +++ b/cmake/FindGflags.cmake @@ -394,7 +394,7 @@ if (GFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION) if (FOUND_INSTALLED_GFLAGS_CMAKE_CONFIGURATION) message(STATUS "Detected gflags version: ${gflags_VERSION}") set(GFLAGS_FOUND ${gflags_FOUND}) - set(GFLAGS_INCLUDE_DIR "/usr/include") + set(GFLAGS_INCLUDE_DIR ${gflags_INCLUDE_DIR}) set(GFLAGS_LIBRARY ${gflags_LIBRARIES}) # gflags does not export the namespace in their CMake configuration, so diff --git a/internal/ceres/compressed_row_sparse_matrix.cc b/internal/ceres/compressed_row_sparse_matrix.cc index 414bbe1..ee59eae 100644 --- a/internal/ceres/compressed_row_sparse_matrix.cc +++ b/internal/ceres/compressed_row_sparse_matrix.cc @@ -196,11 +196,6 @@ CompressedRowSparseMatrix* CompressedRowSparseMatrix::FromTripletSparseMatrix( CompressedRowSparseMatrix* output = new CompressedRowSparseMatrix(num_rows, num_cols, input.num_nonzeros()); - if (num_rows == 0) { - // No data to copy. - return output; - } - // Copy the contents of the cols and values array in the order given // by index and count the number of entries in each row. int* output_rows = output->mutable_rows();