diff options
| author | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2017-02-17 18:25:08 +0300 |
|---|---|---|
| committer | Sergey Yershov <syershov@maps.me> | 2017-02-17 18:33:50 +0300 |
| commit | 325d595022107c965fffa8276276d062a48ea0a2 (patch) | |
| tree | 80226c5b2c2e528e24e52d25b07e62634dd2b6c7 /coding | |
| parent | 009388f72e98d9eee5a3a2d44e734fcec2f68a7d (diff) | |
Upgraded stb lib, removed lodepngbeta-638
Diffstat (limited to 'coding')
| -rw-r--r-- | coding/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | coding/coding.pro | 6 | ||||
| -rw-r--r-- | coding/png_memory_encoder.cpp | 17 | ||||
| -rw-r--r-- | coding/png_memory_encoder.hpp | 13 |
4 files changed, 0 insertions, 43 deletions
diff --git a/coding/CMakeLists.txt b/coding/CMakeLists.txt index d09d6002b1..51bd2c744b 100644 --- a/coding/CMakeLists.txt +++ b/coding/CMakeLists.txt @@ -3,16 +3,11 @@ project(coding) include_directories( ${OMIM_ROOT}/coding ${OMIM_ROOT}/3party/expat - ${OMIM_ROOT}/3party/lodepng ) set( SRC ${OMIM_ROOT}/3party/expat/expat_impl.h - ${OMIM_ROOT}/3party/lodepng/lodepng.hpp - ${OMIM_ROOT}/3party/lodepng/lodepng_io.hpp - ${OMIM_ROOT}/3party/lodepng/lodepng_io_private.hpp - ${OMIM_ROOT}/3party/lodepng/lodepng.cpp base64.cpp base64.hpp @@ -54,8 +49,6 @@ set( multilang_utf8_string.cpp multilang_utf8_string.hpp parse_xml.hpp - png_memory_encoder.cpp - png_memory_encoder.hpp polymorph_reader.hpp read_write_utils.hpp reader.cpp diff --git a/coding/coding.pro b/coding/coding.pro index 264abb1cc5..4025552cb8 100644 --- a/coding/coding.pro +++ b/coding/coding.pro @@ -8,7 +8,6 @@ ROOT_DIR = .. include($$ROOT_DIR/common.pri) SOURCES += \ - $$ROOT_DIR/3party/lodepng/lodepng.cpp \ base64.cpp \ compressed_bit_vector.cpp \ file_container.cpp \ @@ -20,7 +19,6 @@ SOURCES += \ internal/file_data.cpp \ mmap_reader.cpp \ multilang_utf8_string.cpp \ - png_memory_encoder.cpp \ reader.cpp \ reader_streambuf.cpp \ reader_writer_ops.cpp \ @@ -34,9 +32,6 @@ SOURCES += \ HEADERS += \ $$ROOT_DIR/3party/expat/expat_impl.h \ - $$ROOT_DIR/3party/lodepng/lodepng.hpp \ - $$ROOT_DIR/3party/lodepng/lodepng_io.hpp \ - $$ROOT_DIR/3party/lodepng/lodepng_io_private.hpp \ base64.hpp \ bit_streams.hpp \ buffer_reader.hpp \ @@ -68,7 +63,6 @@ HEADERS += \ mmap_reader.hpp \ multilang_utf8_string.hpp \ parse_xml.hpp \ - png_memory_encoder.hpp \ polymorph_reader.hpp \ read_write_utils.hpp \ reader.hpp \ diff --git a/coding/png_memory_encoder.cpp b/coding/png_memory_encoder.cpp deleted file mode 100644 index 80ac6b4e70..0000000000 --- a/coding/png_memory_encoder.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "png_memory_encoder.hpp" -#include "3party/lodepng/lodepng.hpp" - -#include "base/assert.hpp" - -namespace il -{ - -void EncodePngToMemory(uint32_t width, uint32_t height, - vector<uint8_t> const & rgba, - vector<uint8_t> & out) -{ - CHECK(LodePNG::encode(out, rgba, width, height) == 0, ()); - CHECK(out.size() != 0, ()); -} - -} // namespace il diff --git a/coding/png_memory_encoder.hpp b/coding/png_memory_encoder.hpp deleted file mode 100644 index dd2c5b632e..0000000000 --- a/coding/png_memory_encoder.hpp +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include "std/cstdint.hpp" -#include "std/vector.hpp" - -namespace il -{ - -void EncodePngToMemory(uint32_t width, uint32_t height, - vector<uint8_t> const & rgba, - vector<uint8_t> & out); - -} // namespace il |