Merge pull request #24 from DoubleCouponDay/feat/hosted

Feat/hosted

.dockerignore

@@ -0,0 +1,14 @@
+
+/C_part/lib/
+/Rust_part/target/
+/Rust_part/tests/
+/Rust_part/libvec.a
+/Rust_part/Cargo.lock
+C_part/.xmake/
+C_part/build/
+C_part/test/
+README.md
+LICENSE
+.gitignore
+/.vscode/
+Dockerfile

.gitignore

@@ -1,5 +1,18 @@
-Rust_part/log.txt
-Rust_part/test.png
+Rust_part/template.svg
+**/*.a
+**/*.so
+**/*.lib
+/C_part/lib/
+/C_part/bin/
+conaninfo.txt
+graph_info.json
+conanbuildinfo.cmake
+CMakeFiles/
+**/CMakeCache.txt
+**/Makefile
+cmake_install.cmake
+**/log.txt
+**/conanbuildinfo.txt
 
 # Discord token
 *.discord_token
@@ -15,7 +28,7 @@ Rust_part/test.png
 Rust_part/target
 
 C_part/.xmake/
-C_part/build
+C_part/build/
 
 # Prerequisites
 *.d
@@ -81,3 +94,5 @@ conan.lock
 .xmake/linux/x86_64/xmake.conf
 
 *.lock
+
+Rust_part/vec

.vscode/settings.json

@@ -63,7 +63,8 @@
         "logger.h": "c",
         "string.h": "c",
         "stdio.h": "c",
-        "vec.h": "c"
+        "vec.h": "c",
+        "error.h": "c"
     },
     "C_Cpp.intelliSenseEngineFallback": "Enabled"
 }

C_part/CMakeLists.txt

@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 3.13.4)
+project(vec)
+
+include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+conan_basic_setup()
+
+file(GLOB sourceglob 
+    "${PROJECT_SOURCE_DIR}/src/*.h" "${PROJECT_SOURCE_DIR}/src/*.c" 
+    "${PROJECT_SOURCE_DIR}/src/utility/*.h" "${PROJECT_SOURCE_DIR}/src/utility/*.c"
+    "${PROJECT_SOURCE_DIR}/src/nsvg/*.h" "${PROJECT_SOURCE_DIR}/src/nsvg/*.c"
+    "${PROJECT_SOURCE_DIR}/src/imagefile/*.h" "${PROJECT_SOURCE_DIR}/src/imagefile/*.c")
+
+add_library(${PROJECT_NAME} STATIC ${sourceglob})
+target_link_libraries(${PROJECT_NAME} ${CONAN_LIBS})
+set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "./src/entrypoint.h")
+
+file(COPY "../template.svg" DESTINATION "./bin")

C_part/conanfile.txt

@@ -1,5 +1,6 @@
 [requires]
 libpng/1.6.37
+nanosvg/20190405
 
 [generators]
 cmake

C_part/src/image.c

@@ -81,15 +81,6 @@ bool colours_are_similar(pixel color_a, pixel color_b, float max_distance)
     return abc <= max_distance; // If difference less than the threshold
 }
 
-char* rgb_to_string(pixel* input) {
-    char* output = input->r;
-    output += ',';
-    output += input->g;
-    output += ',';
-    output += input->b;
-    return output;
-}
-
 image create_image(int width, int height)
 {
     image output = {

C_part/src/imagefile/pngfile.c

@@ -5,7 +5,7 @@
 #include "pngfile.h"
 #include "../image.h"
 #include "../utility/error.h"
-#include "utility/logger.h"
+#include "../utility/logger.h"
 
 /// Takes a filename (assumed to be a png file), and creates an image struct full of the png's pixels
 /// 

C_part/src/imagefile/svg.c

@@ -6,7 +6,7 @@
 
 #include "../utility/error.h"
 #include "../nsvg/copy.h"
-#include "utility/logger.h"
+#include "../utility/logger.h"
 #include "../chunkmap.h"
 
 const char* OUTPUT_PATH = "output.svg";

C_part/src/nsvg/bobsweep.c

@@ -1,12 +1,12 @@
 #include "bobsweep.h"
 
-#include "utility/logger.h"
-#include "utility/vec.h"
-#include "imagefile/pngfile.h"
+#include "../utility/logger.h"
+#include "../utility/vec.h"
+#include "../imagefile/pngfile.h"
 #include "mapping.h"
 #include "mapparser.h"
-#include "utility/error.h"
-#include "sort.h"
+#include "../utility/error.h"
+#include "../sort.h"
 
 #include <stdlib.h>
 #include <stdio.h>

C_part/src/nsvg/bobsweep.h

@@ -3,7 +3,7 @@
 
 #include <nanosvg.h>
 
-#include "image.h"
-#include "chunkmap.h"
+#include "../image.h"
+#include "../chunkmap.h"
 
 void sweepfill_chunkmap(chunkmap* map, float threshold);

C_part/src/nsvg/copy.c

@@ -2,9 +2,11 @@
 #include <nanosvg.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
 
-#include "utility/logger.h"
-#include "../utility/error.h";
+#include "../utility/logger.h"
+#include "../utility/error.h"
 
 const char* TEMPLATE_PATH = "template.svg";
 
@@ -33,11 +35,12 @@ char* gettemplate(int width, int height) {
 	char* data = NULL;
 	fp = fopen(TEMPLATE_PATH, "rb");
 
-	if (!fp) {
+	if(fp == NULL) { //still null after trying fix
         LOG_ERR("could not find svg template file.");
         setError(TEMPLATE_FILE_NOT_FOUND);
 		return NULL;
     };
+
 	fseek(fp, 0, SEEK_END);
 	size = ftell(fp);
 	fseek(fp, 0, SEEK_SET);

C_part/src/nsvg/dcdfiller.c

@@ -6,15 +6,14 @@
 #include <math.h>
 #include <nanosvg.h>
 
-#include "usage.h"
 #include "../image.h"
 #include "../chunkmap.h"
-#include "utility/logger.h"
-#include "utility/error.h"
+#include "../utility/logger.h"
+#include "../utility/error.h"
 #include "copy.h"
 #include "mapping.h"
 #include "../sort.h"
-#include "utility/vec.h"
+#include "../utility/vec.h"
 
 const float ZIP_DISTANCE = 0.5;
 

C_part/src/nsvg/mapparser.c

@@ -6,10 +6,9 @@
 #include <math.h>
 #include <nanosvg.h>
 
-#include "usage.h"
 #include "../image.h"
 #include "../chunkmap.h"
-#include "utility/logger.h"
+#include "../utility/logger.h"
 #include "../utility/error.h"
 #include "copy.h"
 #include "mapping.h"

C_part/src/nsvg/mapping.c

@@ -3,7 +3,7 @@
 
 #include "mapping.h"
 #include "../utility/error.h"
-#include "utility/logger.h"
+#include "../utility/logger.h"
 #include "../image.h"
 #include "../chunkmap.h"
 

C_part/src/nsvg/mapping.h

@@ -6,7 +6,7 @@
 
 #include "../image.h"
 #include "../chunkmap.h"
-#include "utility/vec.h"
+#include "../utility/vec.h"
 
 enum mapping_consts {
     BEZIERCURVE_LENGTH = 8,

C_part/src/nsvg/usage.c

@@ -15,9 +15,9 @@
 #include "../sort.h"
 #include "mapparser.h"
 #include "dcdfiller.h"
-#include "imagefile/pngfile.h"
+#include "../imagefile/pngfile.h"
 #include "bobsweep.h"
-#include "utility/logger.h"
+#include "../utility/logger.h"
 
 //entry point of the file
 NSVGimage* dcdfill_for_nsvg(image input, vectorize_options options) {
@@ -86,7 +86,7 @@ NSVGimage* bobsweep_for_nsvg(image input, vectorize_options options) {
 
 	if(isBadError()) {
 		LOG_ERR("quantize_image failed with %d", getLastError());
-		return getAndResetErrorCode();
+		return NULL;
 	}
 
     chunkmap* map = generate_chunkmap(input, options);

C_part/src/utility/error.c

@@ -1,6 +1,6 @@
 #include "error.h"
 
-#include "utility/logger.h"
+#include "logger.h"
 
 int error_code = SUCCESS_CODE;
 

C_part/src/utility/error.h

@@ -14,6 +14,7 @@ enum vectorizing_opcodes {
     LOW_BOUNDARIES_CREATED
 };
 
+int isBadError();
 int getLastError();
 void setError(int error);
 int getAndResetErrorCode();

C_part/src/utility/logger.c

@@ -4,8 +4,6 @@
 #include <time.h>
 #include <stdarg.h>
 
-#include "../../test/debug.h"
-
 FILE* logfile = 0;
 const char* LOG_PATH = "log.txt";
 

Dockerfile

@@ -0,0 +1,37 @@
+#designed for linux build
+FROM rust:1.50
+
+RUN apt-get update && \
+    apt-get install apt-utils -y && \
+    apt-get dist-upgrade -y && \
+    apt-get install -y musl-tools && \    
+    apt-get install software-properties-common -y && \
+    apt-get install python3=3.7.3-1 -y && \
+    apt-get install python-pip -y && \
+    python -m pip install --upgrade pip && \
+    python -m pip install conan && \
+    apt-get install cmake -y && \
+    apt-get install build-essential && \
+    rustup target add x86_64-unknown-linux-musl
+
+# copy C source and Rust source
+COPY ./ /home/sjsui/vectorizer/
+
+# set environment variables
+ENV conanpath /root/.conan/data/
+ENV releasebuild true
+ENV PATH $PATH:/home/sjsui/vectorizer/Rust_part/target/release
+
+# initialize build tools
+WORKDIR /home/sjsui/vectorizer/C_part/build/
+RUN conan install ../ && \
+    conan profile update settings.compiler.libcxx=libstdc++11 default && \
+    cmake ../ && \
+    make
+
+#build Rust code
+WORKDIR /home/sjsui/vectorizer/Rust_part/
+RUN cargo build -vv --release
+
+#create entrypoint of container
+CMD ["./target/release/trampoline"]