Skip to content
Permalink
Browse files

Merge pull request #946 from LittleHuba/new_file_format

Add reading of new file type
  • Loading branch information...
LittleHuba committed Mar 11, 2019
2 parents fcc08e1 + d15239f commit a05afb4d3e0acf388a5bb55e86d14582fd2a9e48
Showing with 670 additions and 70 deletions.
  1. +1 −1 .travis.yml
  2. +4 −0 CMakeLists.txt
  3. +1 −0 src/CMakeLists.txt
  4. +393 −47 src/control/xojfile/LoadHandler.cpp
  5. +15 −3 src/control/xojfile/LoadHandler.h
  6. +8 −1 src/gui/PageViewFindObjectHelper.h
  7. +11 −0 src/model/BackgroundImage.cpp
  8. +1 −0 src/model/BackgroundImage.h
  9. +8 −0 src/model/BackgroundImageContents.cpp
  10. +1 −0 src/model/BackgroundImageContents.h
  11. +20 −6 src/model/Document.cpp
  12. +1 −1 src/model/Document.h
  13. +7 −0 src/pdf/base/XojPdfDocument.cpp
  14. +1 −0 src/pdf/base/XojPdfDocument.h
  15. +1 −0 src/pdf/base/XojPdfDocumentInterface.h
  16. +13 −0 src/pdf/popplerapi/PopplerGlibDocument.cpp
  17. +1 −0 src/pdf/popplerapi/PopplerGlibDocument.h
  18. +60 −9 src/util/XojPreviewExtractor.cpp
  19. +1 −0 src/xoj-preview-extractor/CMakeLists.txt
  20. +1 −1 src/xoj-preview-extractor/xournal-thumbnailer.cpp
  21. +2 −0 test/SpeedTest.cpp
  22. +95 −1 test/control/LoadHandlerTest.cpp
  23. BIN test/files/packaged_xopp/audioAttachment/new.xopp
  24. BIN test/files/packaged_xopp/audioAttachment/old.xopp
  25. BIN test/files/packaged_xopp/audioAttachment/test.ogg
  26. BIN test/files/packaged_xopp/big-test.xopp
  27. BIN test/files/packaged_xopp/imgAttachment/new.xopp
  28. BIN test/files/packaged_xopp/imgAttachment/old.xopp
  29. BIN test/files/packaged_xopp/imgBackground/new.xopp
  30. BIN test/files/packaged_xopp/imgBackground/old.xopp
  31. BIN test/files/packaged_xopp/imgBackground/old.xopp.bg_1.png
  32. BIN test/files/packaged_xopp/layer.xopp
  33. BIN test/files/packaged_xopp/pages.xopp
  34. BIN test/files/packaged_xopp/pdfBackground/new.xopp
  35. BIN test/files/packaged_xopp/pdfBackground/old.xopp
  36. BIN test/files/packaged_xopp/pdfBackground/old.xopp.bg.pdf
  37. BIN test/files/packaged_xopp/stroke/new.xopp
  38. BIN test/files/packaged_xopp/stroke/old.xopp
  39. BIN test/files/packaged_xopp/test.xopp
  40. BIN test/files/packaged_xopp/testPreview.xopp
  41. BIN test/files/packaged_xopp/testPreview2.xopp
  42. BIN test/files/packaged_xopp/text.xopp
  43. +24 −0 test/util/XojPreviewExtractorTest.cpp
@@ -30,8 +30,8 @@ addons:
- libpoppler-glib-dev
- portaudio19-dev
- libsndfile-dev

- liblua5.3-dev
- libzip-dev

coverity_scan:
project:
@@ -86,6 +86,10 @@ set(POPPLER_INCLUDE_DIR, "${PopplerGlib_INCLUDE_DIRS}")
find_package (ZLIB REQUIRED)
add_includes_ldflags ("${ZLIB_LIBRARIES}" "${ZLIB_INCLUDE_DIRS}")

# libzip
pkg_check_modules (ZIP REQUIRED "libzip >= 1.0.1")
add_includes_ldflags ("${ZIP_LIBRARIES}" "${ZIP_INCLUDE_DIRS}")

# pthreads
find_package (Threads REQUIRED)
set (xournalpp_LDFLAGS ${xournalpp_LDFLAGS} ${CMAKE_THREAD_LIBS_INIT})
@@ -53,6 +53,7 @@ file (GLOB_RECURSE xournalpp_SOURCES_RECURSE
control/*.cpp
enums/*.cpp
gui/*.cpp
io/*.cpp
model/*.cpp
plugin/*.cpp
undo/*.cpp

0 comments on commit a05afb4

Please sign in to comment.
You can’t perform that action at this time.