update dependencies

- remove openssl lib
- use usr lib jsoncpp

Author: shincurry

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "cxxopts"]
 	path = cxxopts
 	url = https://github.com/jarro2783/cxxopts.git
-[submodule "jsoncpp"]
-	path = jsoncpp
-	url = https://github.com/open-source-parsers/jsoncpp.git

CMakeLists.txt

@@ -6,7 +6,6 @@ find_package(PkgConfig REQUIRED)
 add_subdirectory(${PROJECT_SOURCE_DIR}/cxxopts)
 
 include_directories(${PROJECT_SOURCE_DIR}/cxxopts/include)
-include_directories(${PROJECT_SOURCE_DIR}/jsoncpp/dist/json)
 include_directories(${PROJECT_SOURCE_DIR}/research)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
@@ -22,16 +21,14 @@ set(CLI_SOURCE_FILES
     animeloop-cli/models.cpp
     animeloop-cli/models.hpp
     animeloop-cli/utils.cpp
-    animeloop-cli/utils.hpp
-    jsoncpp/dist/jsoncpp.cpp
-        )
+    animeloop-cli/utils.hpp)
 
 add_executable(animeloop-cli ${CLI_SOURCE_FILES})
 
 set(SIMILAR_SAME_SOURCE_FILES
     animeloop-cli/algorithm.cpp
     animeloop-cli/algorithm.hpp
-        research/similar_and_same.cpp)
+    research/similar_and_same.cpp)
 
 add_executable(similar-and-same ${SIMILAR_SAME_SOURCE_FILES})
 
@@ -49,6 +46,12 @@ set(COLOR_SOURCE_FILES
 
 add_executable(color ${COLOR_SOURCE_FILES})
 
+# Jsoncpp
+pkg_check_modules(JSONCPP jsoncpp)
+target_link_libraries(animeloop-cli ${JSONCPP_LIBRARIES})
+### temp fix for Ubuntu ###
+include_directories(animeloop-cli /usr/include/jsoncpp)
+
 # OpenCV
 find_package( OpenCV 3.2 REQUIRED )
 target_link_libraries( animeloop-cli ${OpenCV_LIBS} )
@@ -59,17 +62,4 @@ target_link_libraries( color ${OpenCV_LIBS})
 # Boost
 find_package(Boost COMPONENTS filesystem date_time system program_options REQUIRED)
 target_link_libraries( animeloop-cli ${Boost_LIBRARIES} )
-target_link_libraries( cuts-switch ${Boost_LIBRARIES} )
-
-# Search OpenSSL
-pkg_search_module(OPENSSL REQUIRED openssl)
-
-if( OPENSSL_FOUND )
-    include_directories(${OPENSSL_INCLUDE_DIRS})
-    message(STATUS "Using OpenSSL ${OPENSSL_VERSION}")
-else()
-    # Error; with REQUIRED, pkg_search_module() will throw an error by it's own
-endif()
-
-target_link_libraries( animeloop-cli ${OPENSSL_LIBRARIES})
-target_link_libraries( cuts-switch ${OPENSSL_LIBRARIES})
+target_link_libraries( cuts-switch ${Boost_LIBRARIES} )

animeloop-cli.xcodeproj/project.pbxproj

@@ -19,10 +19,9 @@
 		8818F2EC1E920F260085F368 /* models.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8818F2EA1E920F260085F368 /* models.cpp */; };
 		8818F2EF1E920F3E0085F368 /* utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8818F2ED1E920F3E0085F368 /* utils.cpp */; };
 		8818F2F51E9242310085F368 /* filter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8818F2F31E9242310085F368 /* filter.cpp */; };
-		884E2E261F30D787001EA03E /* libcrypto.1.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 884E2E241F30D769001EA03E /* libcrypto.1.0.0.dylib */; };
 		88537E9D1E4C501900385BCB /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 88537E9C1E4C501900385BCB /* main.cpp */; };
+		88C992831F947CF70012ED53 /* libjsoncpp.1.8.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 88C992821F947CF70012ED53 /* libjsoncpp.1.8.3.dylib */; };
 		88DC61451E585CCE0062B914 /* algorithm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 88DC61431E585CCE0062B914 /* algorithm.cpp */; };
-		88E08EB61E5ACAD60080D35E /* jsoncpp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 88E08EB51E5ACAD60080D35E /* jsoncpp.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -62,29 +61,27 @@
 		88537EAC1E4C671F00385BCB /* libopencv_imgproc.3.2.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopencv_imgproc.3.2.0.dylib; path = ../../../../../usr/local/lib/libopencv_imgproc.3.2.0.dylib; sourceTree = "<group>"; };
 		889337CA1E9E318C004C69AD /* libopencv_face.3.2.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopencv_face.3.2.0.dylib; path = ../../../../../usr/local/lib/libopencv_face.3.2.0.dylib; sourceTree = "<group>"; };
 		889337CC1E9E31AE004C69AD /* libopencv_objdetect.3.2.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libopencv_objdetect.3.2.0.dylib; path = ../../../../../usr/local/lib/libopencv_objdetect.3.2.0.dylib; sourceTree = "<group>"; };
+		88C992821F947CF70012ED53 /* libjsoncpp.1.8.3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libjsoncpp.1.8.3.dylib; path = ../../../../../usr/local/Cellar/jsoncpp/1.8.3/lib/libjsoncpp.1.8.3.dylib; sourceTree = "<group>"; };
 		88DC61431E585CCE0062B914 /* algorithm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = algorithm.cpp; path = "animeloop-cli/algorithm.cpp"; sourceTree = "<group>"; };
 		88DC61441E585CCE0062B914 /* algorithm.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = algorithm.hpp; path = "animeloop-cli/algorithm.hpp"; sourceTree = "<group>"; };
 		88DC91531E7FD737005C122D /* libMagick++-7.Q16HDRI.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libMagick++-7.Q16HDRI.2.dylib"; path = "../../../../../usr/local/Cellar/imagemagick/7.0.5-3/lib/libMagick++-7.Q16HDRI.2.dylib"; sourceTree = "<group>"; };
 		88DC91551E7FD7BF005C122D /* libMagick++-7.Q16HDRI.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libMagick++-7.Q16HDRI.a"; path = "../../../../../usr/local/Cellar/imagemagick/7.0.5-3/lib/libMagick++-7.Q16HDRI.a"; sourceTree = "<group>"; };
-		88E08EB51E5ACAD60080D35E /* jsoncpp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = jsoncpp.cpp; path = jsoncpp/dist/jsoncpp.cpp; sourceTree = "<group>"; };
-		88E08EB81E5ACB030080D35E /* json-forwards.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "json-forwards.h"; sourceTree = "<group>"; };
-		88E08EB91E5ACB030080D35E /* json.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = json.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		88537E961E4C501900385BCB /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				884E2E261F30D787001EA03E /* libcrypto.1.0.0.dylib in Frameworks */,
+				88C992831F947CF70012ED53 /* libjsoncpp.1.8.3.dylib in Frameworks */,
 				88088C1A1E4E333A00601DBD /* libboost_date_time.dylib in Frameworks */,
 				88088C181E4E29E400601DBD /* libboost_system.dylib in Frameworks */,
+				88088C111E4E28B900601DBD /* libboost_filesystem.dylib in Frameworks */,
 				88088C121E4E294600601DBD /* libopencv_core.3.2.0.dylib in Frameworks */,
 				88088C131E4E294600601DBD /* libopencv_imgcodecs.3.2.0.dylib in Frameworks */,
 				88088C141E4E294600601DBD /* libopencv_imgproc.3.2.0.dylib in Frameworks */,
 				88088C151E4E294600601DBD /* libopencv_video.3.2.0.dylib in Frameworks */,
 				88088C161E4E294600601DBD /* libopencv_videoio.3.2.0.dylib in Frameworks */,
-				88088C111E4E28B900601DBD /* libboost_filesystem.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -130,7 +127,6 @@
 				88537E9B1E4C501900385BCB /* animeloop-cli */,
 				88088BF91E4DF6B700601DBD /* loop-video */,
 				88088BFA1E4E1BEF00601DBD /* cxxopts */,
-				88E08E731E5AC9950080D35E /* jsoncpp */,
 				88537E9A1E4C501900385BCB /* Products */,
 				88537EA61E4C52CC00385BCB /* Frameworks */,
 			);
@@ -155,6 +151,7 @@
 		88537EA61E4C52CC00385BCB /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				88C992821F947CF70012ED53 /* libjsoncpp.1.8.3.dylib */,
 				884E2E241F30D769001EA03E /* libcrypto.1.0.0.dylib */,
 				889337CC1E9E31AE004C69AD /* libopencv_objdetect.3.2.0.dylib */,
 				889337CA1E9E318C004C69AD /* libopencv_face.3.2.0.dylib */,
@@ -174,25 +171,6 @@
 			name = Frameworks;
 			sourceTree = "<group>";
 		};
-		88E08E731E5AC9950080D35E /* jsoncpp */ = {
-			isa = PBXGroup;
-			children = (
-				88E08EB71E5ACB030080D35E /* json */,
-				88E08EB51E5ACAD60080D35E /* jsoncpp.cpp */,
-			);
-			name = jsoncpp;
-			sourceTree = "<group>";
-		};
-		88E08EB71E5ACB030080D35E /* json */ = {
-			isa = PBXGroup;
-			children = (
-				88E08EB81E5ACB030080D35E /* json-forwards.h */,
-				88E08EB91E5ACB030080D35E /* json.h */,
-			);
-			name = json;
-			path = jsoncpp/dist/json;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -250,7 +228,6 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				88E08EB61E5ACAD60080D35E /* jsoncpp.cpp in Sources */,
 				8818F2F51E9242310085F368 /* filter.cpp in Sources */,
 				8818F2EC1E920F260085F368 /* models.cpp in Sources */,
 				88DC61451E585CCE0062B914 /* algorithm.cpp in Sources */,
@@ -372,8 +349,7 @@
 					/usr/local/lib,
 					/usr/local/Cellar/ffmpeg/3.2.3/lib,
 					/usr/local/Cellar/boost/1.63.0/lib,
-					/usr/local/Cellar/openssl/1.0.2j/lib,
-					/usr/local/Cellar/openssl/1.0.2l/lib,
+					/usr/local/Cellar/jsoncpp/1.8.3/lib,
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -390,8 +366,7 @@
 					/usr/local/lib,
 					/usr/local/Cellar/ffmpeg/3.2.3/lib,
 					/usr/local/Cellar/boost/1.63.0/lib,
-					/usr/local/Cellar/openssl/1.0.2j/lib,
-					/usr/local/Cellar/openssl/1.0.2l/lib,
+					/usr/local/Cellar/jsoncpp/1.8.3/lib,
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_NAME = "$(TARGET_NAME)";

animeloop-cli/loop_video.cpp

@@ -11,7 +11,7 @@
 #include "utils.hpp"
 #include "filter.hpp"
 
-#include "json.h"
+#include <json/json.h>
 #include <sys/wait.h>
 
 using namespace std;
@@ -21,7 +21,6 @@ using namespace al;
 
 
 al::LoopVideo::LoopVideo(std::string input, std::string output_path) {
-    this->md5 = md5_of_file(input);
 
     this->filename = path(input).stem().string();
     this->title = this->filename;
@@ -100,15 +99,14 @@ int fork_gen_cover(string video_filepath, string cover_filepath) {
 
 void al::LoopVideo::generate(const LoopDurations durations) {
     VideoInfo info = get_info(this->input_filepath);
-    
+
     Json::Value videos_json;
     videos_json["title"] = this->title;
 
-    videos_json["version"] = kVersion;
+    videos_json["version"] = kOutputVersion;
 
     Json::Value source_json;
     source_json["filename"] = this->filename;
-    source_json["md5"] = this->md5;
     videos_json["source"].append(source_json);
 
     int count = 0;
@@ -185,15 +183,12 @@ void al::LoopVideo::generate(const LoopDurations durations) {
         period_json["begin"] = al::time_string(start_frame / info.fps);
         period_json["end"] = al::time_string(end_frame / info.fps);
         video_json["period"] = period_json;
-        
-        auto md5 = al::md5_of_file(video_filepath);
-        video_json["md5"] = md5;
-        
+
         videos_json["loops"].append(video_json);
     });
 
     string json_string = videos_json.toStyledString();
     std::ofstream out(path(this->loops_dirpath).append(this->filename + ".json").string());
     out << json_string;
     out.close();
-}
+}

animeloop-cli/loop_video.hpp

@@ -16,7 +16,8 @@
 #include <boost/filesystem.hpp>
 
 namespace al {
-    const std::string kVersion = "2.0.0";
+    const std::string kVersion = "2.0.1";
+    const std::string kOutputVersion = "2.0.0";
 
     class LoopVideo {
     public:
@@ -81,11 +82,7 @@ namespace al {
          @param durations durations data
          */
         void generate(const al::LoopDurations filtered_durations);
-
-    private:
-        std::string md5;
     };
 }
 
-
 #endif /* loop_video_hpp */

animeloop-cli/utils.cpp

@@ -9,11 +9,11 @@
 #include "utils.hpp"
 #include "algorithm.hpp"
 
-#include "json.h"
+#include <json/json.h>
 #include <boost/filesystem.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/regex.hpp>
-#include <openssl/md5.h>
+//#include <openssl/md5.h>
 #include <numeric>
 #include <sys/wait.h>
 #include <fstream>
@@ -315,25 +315,4 @@ std::string al::time_string(double seconds) {
     auto ms = boost::posix_time::milliseconds(seconds * 1000);
     auto time = boost::posix_time::time_duration(ms);
     return boost::posix_time::to_simple_string(time);
-}
-
-std::string al::md5_of_file(std::string filename) {
-    MD5_CTX ctx;
-    MD5_Init(&ctx);
-    
-    std::ifstream ifs(filename, std::ios::binary);
-    
-    char file_buffer[4096];
-    while (ifs.read(file_buffer, sizeof(file_buffer)) || ifs.gcount()) {
-        MD5_Update(&ctx, file_buffer, ifs.gcount());
-    }
-    unsigned char digest[MD5_DIGEST_LENGTH] = {};
-    MD5_Final(digest, &ctx);
-    
-    std::stringstream stream;
-    for(unsigned i=0; i <MD5_DIGEST_LENGTH; i++) {
-        stream << std::hex << std::setw(2) << std::setfill('0') << static_cast<int>(digest[i]);
-    }
-    std::string md5_string = stream.str();
-    return md5_string;
-}
+}

animeloop-cli/utils.hpp

@@ -55,14 +55,6 @@ namespace al {
      @return Time string
      */
     std::string time_string(double seconds);
-
-    /**
-     Generate the MD5 checksum of a file.
-
-     @param filename file path
-     @return md5 string value
-     */
-    std::string md5_of_file(std::string filename);
 }
 
 #endif /* utils_hpp */