Can now display a few more raster image types
This commit is contained in:
parent
1850da9a2b
commit
b34a76ace3
3 changed files with 37 additions and 6 deletions
|
|
@ -3,7 +3,7 @@
|
||||||
<component type="desktop-application">
|
<component type="desktop-application">
|
||||||
<id>com.infinipaint.infinipaint</id>
|
<id>com.infinipaint.infinipaint</id>
|
||||||
<name>Infinipaint</name>
|
<name>Infinipaint</name>
|
||||||
<summary>Infinite canvas program</summary>
|
<summary>Draw on a big canvas</summary>
|
||||||
<metadata_license>CC0-1.0</metadata_license>
|
<metadata_license>CC0-1.0</metadata_license>
|
||||||
<project_license>MIT</project_license>
|
<project_license>MIT</project_license>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -64,9 +64,11 @@ modules:
|
||||||
- type: archive
|
- type: archive
|
||||||
url: https://github.com/google/skia/archive/aefbd9403c1b3032ad4cd0281ef312ed262c7125.zip
|
url: https://github.com/google/skia/archive/aefbd9403c1b3032ad4cd0281ef312ed262c7125.zip
|
||||||
sha256: e10c67a96828b9f36364e2459cdee3e3b381a3875ff78db2b30e7b6fe69509bb
|
sha256: e10c67a96828b9f36364e2459cdee3e3b381a3875ff78db2b30e7b6fe69509bb
|
||||||
- name: infinipaint
|
- name: infinipaint-x86_64
|
||||||
buildsystem: cmake-ninja
|
buildsystem: cmake-ninja
|
||||||
builddir: true
|
builddir: true
|
||||||
|
only-arches:
|
||||||
|
- x86_64
|
||||||
config-opts:
|
config-opts:
|
||||||
- -DLINK_SKIA_MANUALLY=ON
|
- -DLINK_SKIA_MANUALLY=ON
|
||||||
- -DSKIA_INCLUDE=/app/Skia
|
- -DSKIA_INCLUDE=/app/Skia
|
||||||
|
|
@ -79,6 +81,29 @@ modules:
|
||||||
- -DSKIA_PARAGRAPH_LIB=/app/Skia/out/Static/libskparagraph.a
|
- -DSKIA_PARAGRAPH_LIB=/app/Skia/out/Static/libskparagraph.a
|
||||||
- -DCMAKE_BUILD_TYPE=Release
|
- -DCMAKE_BUILD_TYPE=Release
|
||||||
- -DTBB_NOT_ONETBB=ON
|
- -DTBB_NOT_ONETBB=ON
|
||||||
|
- -DGRAPHICS_BACKEND=OpenGL3.3
|
||||||
|
sources:
|
||||||
|
- type: dir
|
||||||
|
# branch: master
|
||||||
|
path: ..
|
||||||
|
- name: infinipaint-aarch64
|
||||||
|
buildsystem: cmake-ninja
|
||||||
|
builddir: true
|
||||||
|
only-arches:
|
||||||
|
- aarch64
|
||||||
|
config-opts:
|
||||||
|
- -DLINK_SKIA_MANUALLY=ON
|
||||||
|
- -DSKIA_INCLUDE=/app/Skia
|
||||||
|
- -DSKIA_LIB=/app/Skia/out/Static/libskia.a
|
||||||
|
- -DSKIA_SVG_LIB=/app/Skia/out/Static/libsvg.a
|
||||||
|
- -DSKIA_RESOURCES_LIB=/app/Skia/out/Static/libskresources.a
|
||||||
|
- -DSKIA_SHAPER_LIB=/app/Skia/out/Static/libskshaper.a
|
||||||
|
- -DSKIA_UNICODE_ICU_LIB=/app/Skia/out/Static/libskunicode_core.a
|
||||||
|
- -DSKIA_UNICODE_CORE_LIB=/app/Skia/out/Static/libskunicode_icu.a
|
||||||
|
- -DSKIA_PARAGRAPH_LIB=/app/Skia/out/Static/libskparagraph.a
|
||||||
|
- -DCMAKE_BUILD_TYPE=Release
|
||||||
|
- -DTBB_NOT_ONETBB=ON
|
||||||
|
- -DGRAPHICS_BACKEND=OpenGL2.1
|
||||||
sources:
|
sources:
|
||||||
- type: dir
|
- type: dir
|
||||||
# branch: master
|
# branch: master
|
||||||
|
|
|
||||||
|
|
@ -4,15 +4,21 @@
|
||||||
#include <include/codec/SkBmpDecoder.h>
|
#include <include/codec/SkBmpDecoder.h>
|
||||||
#include <include/codec/SkIcoDecoder.h>
|
#include <include/codec/SkIcoDecoder.h>
|
||||||
#include <include/codec/SkGifDecoder.h>
|
#include <include/codec/SkGifDecoder.h>
|
||||||
|
#include <include/codec/SkRawDecoder.h>
|
||||||
|
#include <include/codec/SkWbmpDecoder.h>
|
||||||
|
#include <include/codec/SkWebpDecoder.h>
|
||||||
#include "../MainProgram.hpp"
|
#include "../MainProgram.hpp"
|
||||||
#include <Helpers/Logger.hpp>
|
#include <Helpers/Logger.hpp>
|
||||||
|
|
||||||
std::array<const SkCodecs::Decoder, 5> decoders = {
|
std::array<const SkCodecs::Decoder, 8> decoders = {
|
||||||
SkPngDecoder::Decoder(),
|
|
||||||
SkJpegDecoder::Decoder(),
|
|
||||||
SkBmpDecoder::Decoder(),
|
SkBmpDecoder::Decoder(),
|
||||||
|
SkGifDecoder::Decoder(),
|
||||||
SkIcoDecoder::Decoder(),
|
SkIcoDecoder::Decoder(),
|
||||||
SkGifDecoder::Decoder()
|
SkJpegDecoder::Decoder(),
|
||||||
|
SkPngDecoder::Decoder(),
|
||||||
|
SkRawDecoder::Decoder(),
|
||||||
|
SkWbmpDecoder::Decoder(),
|
||||||
|
SkWebpDecoder::Decoder()
|
||||||
};
|
};
|
||||||
|
|
||||||
bool ImageResourceDisplay::update_draw() const {
|
bool ImageResourceDisplay::update_draw() const {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue