SVN commit 712420 by cgilles:
kipi-plugins from trunk (KDE4) : re-written from scratch Acquire Images plugin usin new libksane library. A fresh screenshot from digiKam for KDE4: http://digikam3rdparty.free.fr/Screenshots/digikamKDE4_09.png TODO: - added support of 16 bits color depth images (need to patch libksane). - added Exif info about image properties and scanner device used to acquire image. - added TIFF writting mode support. - added remote path to save image. CCMAIL: [hidden email] CCMAIL: [hidden email] CCMAIL: [hidden email] M +19 -15 CMakeLists.txt A acquireimages (directory) AM acquireimages/CMakeLists.txt AM acquireimages/Messages.sh AM acquireimages/acquireimagedialog.cpp [License: GPL (v2+)] AM acquireimages/acquireimagedialog.h [License: GPL (v2+)] A acquireimages/kipiplugin_acquireimages.desktop AM acquireimages/plugin_acquireimages.cpp [License: GPL] AM acquireimages/plugin_acquireimages.h [License: GPL] AM acquireimages/scandialog.cpp [License: GPL] AM acquireimages/scandialog.h [License: GPL] A cmake/modules/FindKsane.cmake --- trunk/extragear/libs/kipi-plugins/CMakeLists.txt #712419:712420 @@ -25,39 +25,42 @@ # ======================================================= # Depencies detection require by all plugins -SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) +SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) FIND_PACKAGE(Kexiv2 REQUIRED) FIND_PACKAGE(Kdcraw REQUIRED) +FIND_PACKAGE(Ksane REQUIRED) FIND_PACKAGE(Kipi REQUIRED) FIND_PACKAGE(JPEG REQUIRED) FIND_PACKAGE(PNG REQUIRED) FIND_PACKAGE(TIFF REQUIRED) # Optional depencies detection require by any plugins -MACRO_OPTIONAL_FIND_PACKAGE(Gphoto2) -MACRO_OPTIONAL_FIND_PACKAGE(OpenGL) +#MACRO_OPTIONAL_FIND_PACKAGE(Gphoto2) +#MACRO_OPTIONAL_FIND_PACKAGE(OpenGL) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/common/libkipiplugins ${CMAKE_CURRENT_BINARY_DIR}/common/libkipiplugins ${KEXIV2_INCLUDE_DIR} ${KDCRAW_INCLUDE_DIR} + ${KSANE_INCLUDE_DIR} ${KIPI_INCLUDE_DIR} ${KDE4_INCLUDES} ${QT4_INCLUDES} - ) + ) +# TODO: others optional depencies to check when others plugins will be ported to KDE4 +# +# Plugins witch depand of GPhoto2 +#IF(KDE4_GPHOTO2 AND GPHOTO2_FOUND) +# macro_optional_add_subdirectory(kameraklient) +#ENDIF(KDE4_GPHOTO2 AND GPHOTO2_FOUND) +# # Plugins witch depand of OpenGL -IF(OPENGL_FOUND AND OPENGL_GLU_FOUND) - MACRO_OPTIONAL_ADD_SUBDIRECTORY(slideshow) - MACRO_OPTIONAL_ADD_SUBDIRECTORY(imageviewer) -ENDIF(OPENGL_FOUND AND OPENGL_GLU_FOUND) - -# Plugins witch depand of GPhoto2 -IF(KDE4_GPHOTO2 AND GPHOTO2_FOUND) - #macro_optional_add_subdirectory(kameraklient) -ENDIF(KDE4_GPHOTO2 AND GPHOTO2_FOUND) - -# TODO: others optional depencies to check +#IF(OPENGL_FOUND AND OPENGL_GLU_FOUND) +# MACRO_OPTIONAL_ADD_SUBDIRECTORY(slideshow) +# MACRO_OPTIONAL_ADD_SUBDIRECTORY(imageviewer) +#ENDIF(OPENGL_FOUND AND OPENGL_GLU_FOUND) +# # htmlexport need Xslt library # slideshow need Imlib2 library # ipodexport need Gpod library @@ -76,6 +79,7 @@ ADD_SUBDIRECTORY(common) ADD_SUBDIRECTORY(timeadjust) ADD_SUBDIRECTORY(jpeglossless) +ADD_SUBDIRECTORY(acquireimages) IF(NOT WIN32) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/kipi-plugins.lsm.cmake ${CMAKE_CURRENT_BINARY_DIR}/kipi-plugins.lsm) ** trunk/extragear/libs/kipi-plugins/acquireimages/CMakeLists.txt #property svn:eol-style + native ** trunk/extragear/libs/kipi-plugins/acquireimages/Messages.sh #property svn:eol-style + native ** trunk/extragear/libs/kipi-plugins/acquireimages/Messages.sh #property svn:executable + * ** trunk/extragear/libs/kipi-plugins/acquireimages/acquireimagedialog.cpp #property svn:eol-style + native ** trunk/extragear/libs/kipi-plugins/acquireimages/acquireimagedialog.h #property svn:eol-style + native ** trunk/extragear/libs/kipi-plugins/acquireimages/plugin_acquireimages.cpp #property svn:eol-style + native ** trunk/extragear/libs/kipi-plugins/acquireimages/plugin_acquireimages.h #property svn:eol-style + native ** trunk/extragear/libs/kipi-plugins/acquireimages/scandialog.cpp #property svn:eol-style + native ** trunk/extragear/libs/kipi-plugins/acquireimages/scandialog.h #property svn:eol-style + native _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel |
Really nice work ;)
Angelo _______________________________________________ Digikam-devel mailing list [hidden email] https://mail.kde.org/mailman/listinfo/digikam-devel attachment0 (196 bytes) Download Attachment |
Free forum by Nabble | Edit this page |