Revision: 4439 http://pd-gem.svn.sourceforge.net/pd-gem/?rev=4439&view=rev Author: zmoelnig Date: 2011-08-08 14:32:15 +0000 (Mon, 08 Aug 2011)
Log Message: ----------- adjust to imageloader/imagesaver split into interface/implementation Modified Paths: -------------- trunk/Gem/plugins/imageJPEG/imageJPEG.cpp trunk/Gem/plugins/imageJPEG/imageJPEG.h trunk/Gem/plugins/imageMAGICK/imageMAGICK.cpp trunk/Gem/plugins/imageMAGICK/imageMAGICK.h trunk/Gem/plugins/imageQT/imageQT.cpp trunk/Gem/plugins/imageQT/imageQT.h trunk/Gem/plugins/imageSGI/imageSGI.cpp trunk/Gem/plugins/imageSGI/imageSGI.h trunk/Gem/plugins/imageTIFF/imageTIFF.cpp trunk/Gem/plugins/imageTIFF/imageTIFF.h trunk/Gem/src/Gem/ImageLoad.cpp trunk/Gem/src/Gem/ImageSave.cpp trunk/Gem/src/plugins/Makefile.am Modified: trunk/Gem/plugins/imageJPEG/imageJPEG.cpp =================================================================== --- trunk/Gem/plugins/imageJPEG/imageJPEG.cpp 2011-08-08 14:29:40 UTC (rev 4438) +++ trunk/Gem/plugins/imageJPEG/imageJPEG.cpp 2011-08-08 14:32:15 UTC (rev 4439) @@ -20,6 +20,7 @@ #ifdef HAVE_LIBJPEG #include <string.h> #include "imageJPEG.h" +#include "plugins/PluginFactory.h" #include "Gem/RTE.h" Modified: trunk/Gem/plugins/imageJPEG/imageJPEG.h =================================================================== --- trunk/Gem/plugins/imageJPEG/imageJPEG.h 2011-08-08 14:29:40 UTC (rev 4438) +++ trunk/Gem/plugins/imageJPEG/imageJPEG.h 2011-08-08 14:32:15 UTC (rev 4439) @@ -13,7 +13,7 @@ #ifndef INCLUDE_GEM_PLUGINS_IMAGEJPEG_H_ #define INCLUDE_GEM_PLUGINS_IMAGEJPEG_H_ -#include "plugins/image.h" +#include "plugins/imageBase.h" #include <stdio.h> /*----------------------------------------------------------------- @@ -30,7 +30,7 @@ -----------------------------------------------------------------*/ namespace gem { namespace plugins { -class GEM_EXPORT imageJPEG : public gem::plugins::image { +class GEM_EXPORT imageJPEG : public gem::plugins::imageBase { public: ////////// Modified: trunk/Gem/plugins/imageMAGICK/imageMAGICK.cpp =================================================================== --- trunk/Gem/plugins/imageMAGICK/imageMAGICK.cpp 2011-08-08 14:29:40 UTC (rev 4438) +++ trunk/Gem/plugins/imageMAGICK/imageMAGICK.cpp 2011-08-08 14:32:15 UTC (rev 4439) @@ -22,6 +22,7 @@ #include <string.h> #include "imageMAGICK.h" +#include "plugins/PluginFactory.h" #include "Gem/RTE.h" Modified: trunk/Gem/plugins/imageMAGICK/imageMAGICK.h =================================================================== --- trunk/Gem/plugins/imageMAGICK/imageMAGICK.h 2011-08-08 14:29:40 UTC (rev 4438) +++ trunk/Gem/plugins/imageMAGICK/imageMAGICK.h 2011-08-08 14:32:15 UTC (rev 4439) @@ -13,7 +13,7 @@ #ifndef INCLUDE_GEM_PLUGINS_IMAGEMAGICK_H_ #define INCLUDE_GEM_PLUGINS_IMAGEMAGICK_H_ -#include "plugins/image.h" +#include "plugins/imageBase.h" #include <stdio.h> /*----------------------------------------------------------------- @@ -30,7 +30,7 @@ -----------------------------------------------------------------*/ namespace gem { namespace plugins { -class GEM_EXPORT imageMAGICK : public gem::plugins::image { +class GEM_EXPORT imageMAGICK : public gem::plugins::imageBase { public: ////////// Modified: trunk/Gem/plugins/imageQT/imageQT.cpp =================================================================== --- trunk/Gem/plugins/imageQT/imageQT.cpp 2011-08-08 14:29:40 UTC (rev 4438) +++ trunk/Gem/plugins/imageQT/imageQT.cpp 2011-08-08 14:32:15 UTC (rev 4439) @@ -42,6 +42,7 @@ # include "Gem/RTE.h" # include "imageQT.h" +#include "plugins/PluginFactory.h" # ifdef HAVE_CARBONQUICKTIME # include <Carbon/Carbon.h> @@ -228,7 +229,7 @@ // ///////////////////////////////////////////////////////// -imageQT :: imageQT() : image(false) +imageQT :: imageQT() : imageBase(false) { static bool firsttime=true; if(firsttime) { Modified: trunk/Gem/plugins/imageQT/imageQT.h =================================================================== --- trunk/Gem/plugins/imageQT/imageQT.h 2011-08-08 14:29:40 UTC (rev 4438) +++ trunk/Gem/plugins/imageQT/imageQT.h 2011-08-08 14:32:15 UTC (rev 4439) @@ -13,7 +13,7 @@ #ifndef INCLUDE_GEM_PLUGINS_IMAGEQT_H_ #define INCLUDE_GEM_PLUGINS_IMAGEQT_H_ -#include "plugins/image.h" +#include "plugins/imageBase.h" #include <stdio.h> /*----------------------------------------------------------------- @@ -30,7 +30,7 @@ -----------------------------------------------------------------*/ namespace gem { namespace plugins { -class GEM_EXPORT imageQT : public gem::plugins::image { +class GEM_EXPORT imageQT : public gem::plugins::imageBase { public: ////////// Modified: trunk/Gem/plugins/imageSGI/imageSGI.cpp =================================================================== --- trunk/Gem/plugins/imageSGI/imageSGI.cpp 2011-08-08 14:29:40 UTC (rev 4438) +++ trunk/Gem/plugins/imageSGI/imageSGI.cpp 2011-08-08 14:32:15 UTC (rev 4439) @@ -20,8 +20,8 @@ #include <string.h> #include "imageSGI.h" #include "Gem/RTE.h" -#include "imageSGI.h" #include "sgiimage.h" +#include "plugins/PluginFactory.h" using namespace gem::plugins; Modified: trunk/Gem/plugins/imageSGI/imageSGI.h =================================================================== --- trunk/Gem/plugins/imageSGI/imageSGI.h 2011-08-08 14:29:40 UTC (rev 4438) +++ trunk/Gem/plugins/imageSGI/imageSGI.h 2011-08-08 14:32:15 UTC (rev 4439) @@ -13,7 +13,7 @@ #ifndef INCLUDE_GEM_PLUGINS_IMAGESGI_H_ #define INCLUDE_GEM_PLUGINS_IMAGESGI_H_ -#include "plugins/imageloader.h" +#include "plugins/imageloaderBase.h" #include <stdio.h> /*----------------------------------------------------------------- @@ -30,7 +30,7 @@ -----------------------------------------------------------------*/ namespace gem { namespace plugins { -class GEM_EXPORT imageSGI : public gem::plugins::imageloader { +class GEM_EXPORT imageSGI : public gem::plugins::imageloaderBase { public: ////////// Modified: trunk/Gem/plugins/imageTIFF/imageTIFF.cpp =================================================================== --- trunk/Gem/plugins/imageTIFF/imageTIFF.cpp 2011-08-08 14:29:40 UTC (rev 4438) +++ trunk/Gem/plugins/imageTIFF/imageTIFF.cpp 2011-08-08 14:32:15 UTC (rev 4439) @@ -25,6 +25,7 @@ #include <string.h> #include "imageTIFF.h" +#include "plugins/PluginFactory.h" #include "Gem/RTE.h" Modified: trunk/Gem/plugins/imageTIFF/imageTIFF.h =================================================================== --- trunk/Gem/plugins/imageTIFF/imageTIFF.h 2011-08-08 14:29:40 UTC (rev 4438) +++ trunk/Gem/plugins/imageTIFF/imageTIFF.h 2011-08-08 14:32:15 UTC (rev 4439) @@ -13,7 +13,7 @@ #ifndef INCLUDE_GEM_PLUGINS_IMAGETIFF_H_ #define INCLUDE_GEM_PLUGINS_IMAGETIFF_H_ -#include "plugins/image.h" +#include "plugins/imageBase.h" #include <stdio.h> /*----------------------------------------------------------------- @@ -30,7 +30,7 @@ -----------------------------------------------------------------*/ namespace gem { namespace plugins { -class GEM_EXPORT imageTIFF : public gem::plugins::image { +class GEM_EXPORT imageTIFF : public gem::plugins::imageBase { public: ////////// Modified: trunk/Gem/src/Gem/ImageLoad.cpp =================================================================== --- trunk/Gem/src/Gem/ImageLoad.cpp 2011-08-08 14:29:40 UTC (rev 4438) +++ trunk/Gem/src/Gem/ImageLoad.cpp 2011-08-08 14:32:15 UTC (rev 4439) @@ -20,6 +20,8 @@ #include "Gem/SynchedWorkerThread.h" #include "plugins/imageloader.h" +#include "plugins/PluginFactory.h" + namespace gem { class PixImageLoader : public gem::plugins::imageloader { private: Modified: trunk/Gem/src/Gem/ImageSave.cpp =================================================================== --- trunk/Gem/src/Gem/ImageSave.cpp 2011-08-08 14:29:40 UTC (rev 4438) +++ trunk/Gem/src/Gem/ImageSave.cpp 2011-08-08 14:32:15 UTC (rev 4439) @@ -20,6 +20,7 @@ #include "Gem/Files.h" #include "plugins/imagesaver.h" +#include "plugins/PluginFactory.h" namespace gem { static std::map<std::string, std::string>*s_extension2mime=NULL; @@ -243,6 +244,17 @@ return false; } + virtual float estimateSave(const imageStruct&img, const std::string&filename, const std::string&mimetype, const gem::Properties&props) { + return 1.; + } + virtual void getWriteCapabilities(std::vector<std::string>&mimetypes, gem::Properties&props) { + mimetypes.clear(); + props.clear(); + } + virtual bool isThreadable(void) { + return false; + } + static PixImageSaver*getInstance(void) { if(NULL==s_instance) { s_instance=new PixImageSaver(); Modified: trunk/Gem/src/plugins/Makefile.am =================================================================== --- trunk/Gem/src/plugins/Makefile.am 2011-08-08 14:29:40 UTC (rev 4438) +++ trunk/Gem/src/plugins/Makefile.am 2011-08-08 14:32:15 UTC (rev 4439) @@ -23,10 +23,14 @@ PluginFactoryTimple.h \ imageloader.cpp \ imageloader.h \ + imageloaderBase.cpp \ + imageloaderBase.h \ imagesaver.cpp \ imagesaver.h \ - image.cpp \ - image.h \ + imagesaverBase.cpp \ + imagesaverBase.h \ + imageBase.cpp \ + imageBase.h \ film.cpp \ film.h \ filmBase.cpp \ @@ -45,9 +49,11 @@ PluginFactory.h \ PluginFactoryTimple.h \ film.h \ - image.h \ imageloader.h \ imagesaver.h \ + imageloaderBase.h \ + imagesaverBase.h \ + imageBase.h \ record.h \ recordBase.h \ video.h \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA The must-attend event for mobile developers. Connect with experts. Get tools for creating Super Apps. See the latest technologies. Sessions, hands-on labs, demos & much more. Register early & save! http://p.sf.net/sfu/rim-blackberry-1 _______________________________________________ pd-gem-CVS mailing list pd-gem-CVS@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/pd-gem-cvs