New FLI/FLC encoder/decoder (fix aseprite#7)

Mlatura · Sep 10, 2015 · 3d700ab · 3d700ab
1 parent 2a0f8ca
commit 3d700ab
Show file tree

Hide file tree

Showing 10 changed files with 131 additions and 1,019 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "third_party/libwebp"]
 	path = third_party/libwebp
 	url = https://chromium.googlesource.com/webm/libwebp
+[submodule "src/flic"]
+	path = src/flic
+	url = https://github.com/aseprite/flic.git
diff --git a/README.md b/README.md
@@ -73,7 +73,6 @@ of the following projects created by third-parties:
 * [Google Test](http://code.google.com/p/googletest/) - [gtest license](https://github.com/aseprite/aseprite/tree/master/docs/licenses/gtest-LICENSE.txt)
 * [XFree86](http://www.x.org/) - [XFree86 license](https://github.com/aseprite/aseprite/tree/master/docs/licenses/XFree86-LICENSE.txt)
 * [curl](http://curl.haxx.se/) - [curl license](https://github.com/aseprite/aseprite/tree/master/docs/licenses/curl-LICENSE.txt)
-* [gfli](https://github.com/aseprite/aseprite/blob/master/src/app/file/fli/README) - [GPL license](https://github.com/aseprite/aseprite/tree/master/docs/licenses/GPL.txt)
 * [giflib](http://sourceforge.net/projects/giflib/) - [giflib license](https://github.com/aseprite/aseprite/tree/master/docs/licenses/giflib-LICENSE.txt)
 * [libjpeg](http://www.ijg.org/) - [libjpeg license](https://github.com/aseprite/aseprite/tree/master/docs/licenses/libjpeg-LICENSE.txt)
 * [libpng](http://www.libpng.org/pub/png/) - [libpng license](https://github.com/aseprite/aseprite/tree/master/docs/licenses/libpng-LICENSE.txt)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -91,6 +91,7 @@ add_subdirectory(base)
 include_directories(${BASE_INCLUDE_DIR})
 
 add_subdirectory(cfg)
+add_subdirectory(flic)
 add_subdirectory(css)
 add_subdirectory(doc)
 add_subdirectory(render)

diff --git a/src/README.md b/src/README.md
@@ -16,6 +16,7 @@ because they don't depend on any other component.
   * [allegro](allegro/): Modified version of [Allegro](http://alleg.sourceforge.net/) library, used for keyboard/mouse input, and drawing 2D graphics on screen.
   * [base](base/): Core/basic stuff, multithreading, utf8, sha1, file system, memory, etc.
   * [css](css/): Pseudo-style sheet library.
+  * [flic](flic/): Library to load/save FLI/FLC files
   * [gfx](gfx/): Abstract graphics structures like point, size, rectangle, region, color, etc.
   * [scripting](scripting/): JavaScript engine ([V8](https://code.google.com/p/v8/)).
   * [undo](undo/): Generic library to manage a history of undoable commands.

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -280,7 +280,6 @@ add_library(app-lib
   file/file.cpp
   file/file_format.cpp
   file/file_formats_manager.cpp
-  file/fli/fli.cpp
   file/palette_file.cpp
   file/split_filename.cpp
   ${file_formats}
@@ -411,6 +410,7 @@ target_link_libraries(app-lib
   doc-lib
   filters-lib
   fixmath-lib
+  flic-lib
   gfx-lib
   net-lib
   render-lib

diff --git a/src/app/file/fli/README b/src/app/file/fli/README