Merge pull request #1 from alexge50/develop

Develop

.travis.yml

@@ -0,0 +1,12 @@
+dist: xenial
+language: minimal
+
+services:
+  - docker
+
+install:
+  - chmod +x ./ci/build-docker
+  - ./ci/build-docker
+
+script:
+  - docker run -v $PWD:/root/gie gie:1 /root/gie/ci/build-app

ci/Dockerfile

@@ -0,0 +1,15 @@
+FROM ubuntu:19.04
+
+RUN apt-get update
+RUN apt-get install -qq -y --no-install-recommends \
+            cmake \
+            g++ \
+            make \
+            python3 \
+            libboost-dev \
+            libboost-python1.67-dev \
+            qt5-default \
+            libqt5opengl5-dev \
+            xvfb
+
+ENTRYPOINT ["/bin/bash"]

ci/build-app

@@ -0,0 +1,15 @@
+#!/bin/bash
+set -ev
+
+cd $(dirname $0)/..
+SOURCE_DIR=$PWD
+DIST_DIR=$PWD/dist
+
+BUILD_DIR=$PWD/build
+
+mkdir $BUILD_DIR
+cd $BUILD_DIR
+cmake ..
+cmake --build . --target gie_test
+cd gie
+./gie_test

ci/build-docker

@@ -0,0 +1,4 @@
+#!/bin/bash
+set -ev
+cd $(dirname $0)
+docker build -t gie:1 .

modules/include/types/Image.h

@@ -19,22 +19,39 @@ class Image
     Image(unsigned width, unsigned height):
             width{width},
             height{height},
-            data(N_CHANNELS * width * height)
+            data{new uint8_t[N_CHANNELS * width * height]}
     {}
 
     Image(const uint8_t* data, unsigned width, unsigned height):
             width{width},
             height{height},
-            data(N_CHANNELS * width * height)
+            data{new uint8_t[N_CHANNELS * width * height]}
     {
-        std::memcpy(this->data.data(), data, N_CHANNELS * width * height);
+        std::memcpy(this->data, data, N_CHANNELS * width * height);
     }
 
-    Image(std::vector<uint8_t> data, unsigned width, unsigned height):
+    Image(const std::vector<uint8_t>& vecdata, unsigned width, unsigned height):
         width{width},
         height{height},
-        data{std::move(data)}
-    {}
+        data{new uint8_t[N_CHANNELS * width * height]}
+    {
+        std::memcpy(data, vecdata.data(), N_CHANNELS * width * height);
+    }
+
+    Image(const Image& other):
+            width{other.width},
+            height{other.height},
+            data{new uint8_t[N_CHANNELS * width * height]}
+    {
+        std::memcpy(data, other.data, N_CHANNELS * width * height);
+    }
+
+    Image(Image&&) = default;
+
+    ~Image()
+    {
+        delete[] data;
+    }
 
     Color pixelAt(unsigned row, unsigned column) const
     {
@@ -53,7 +70,7 @@ class Image
     auto width_() { return width; }
     auto height_() { return height; }
 
-    const uint8_t* raw() const { return data.data(); }
+    const uint8_t* raw() const { return data; }
 
 private:
     std::size_t index(unsigned row, unsigned column) const
@@ -62,7 +79,7 @@ class Image
     }
 
 private:
-    std::vector<uint8_t> data;
+    uint8_t* data;
 };
 
 #endif //MODULES_IMAGE_H