1.7.0

diff --git a/psychlops/extension/standard/figure/psychlops_figure_standard.cpp b/psychlops/extension/standard/figure/psychlops_figure_standard.cpp
index ffc150f..b1663af 100644 (file)
--- a/psychlops/extension/standard/figure/psychlops_figure_standard.cpp
+++ b/psychlops/extension/standard/figure/psychlops_figure_standard.cpp
@@ -196,12 +196,12 @@ namespace Figures {
                return *this;
        }
 
-       Movie& Movie::captureOnce()
+       Movie& Movie::captureThisFrame()
        {
-               captureOnce(source_area);
+               captureThisFrame(source_area);
                return *this;
        }
-       Movie& Movie::captureOnce(const Rectangle &source_area_)
+       Movie& Movie::captureThisFrame(const Rectangle &source_area_)
        {
                Image *img = new Image();
                frames.push_back(img);
@@ -212,12 +212,12 @@ namespace Figures {
                }
                return *this;
        }
-       Movie& Movie::captureOnce(int target_frame)
+       Movie& Movie::captureThisFrame(int target_frame)
        {
-               captureOnce(source_area, target_frame);
+               captureThisFrame(source_area, target_frame);
                return *this;
        }
-       Movie& Movie::captureOnce(const Rectangle &source_area_, int target_frame)
+       Movie& Movie::captureThisFrame(const Rectangle &source_area_, int target_frame)
        {
                if(Drawable::prime_is_a_canvas())
                {
@@ -225,12 +225,12 @@ namespace Figures {
                }
                return *this;
        }
-       Movie& Movie::saveEachFrames(const std::string filePrefix)
+       Movie& Movie::saveFramesAsImages(const std::string filePrefix)
        {
                char buf[256];
                for(int i=0; i<frames.size(); i++) {
                        memset(buf, 0, 256);
-                       sprintf(buf, "%u", i);
+                       sprintf(buf, "%05u", i);
                        frames[i]->save(filePrefix+"_"+buf+".png");
                }
                //clear();

diff --git a/psychlops/extension/standard/figure/psychlops_figure_standard.h b/psychlops/extension/standard/figure/psychlops_figure_standard.h
index e8d2b56..3065e7c 100644 (file)
--- a/psychlops/extension/standard/figure/psychlops_figure_standard.h
+++ b/psychlops/extension/standard/figure/psychlops_figure_standard.h
@@ -74,7 +74,8 @@ namespace Figures {
                int current_frame_index;
                std::deque<Image*> frames;
 
-               public:
+               public:\r
+               enum FOURCC { AUTO, DIB, HFYU, PIM1, MP4V, MJPG, DIVX, XVID };
                //static std::string bin_path;
                Rectangle source_area;
 
@@ -91,12 +92,12 @@ namespace Figures {
                virtual Movie& nextFrame();
                virtual Movie& draw(Drawable& target = *Drawable::prime);
 
-               virtual Movie& captureOnce();
-               virtual Movie& captureOnce(const Rectangle &source_area_);
-               virtual Movie& captureOnce(int target_frame);
-               virtual Movie& captureOnce(const Rectangle &source_area_, int target_frame);
-               virtual Movie& save(std::string filename, const double fps = -1);
-               virtual Movie& saveEachFrames(std::string filename);
+               virtual Movie& captureThisFrame();
+               virtual Movie& captureThisFrame(const Rectangle &source_area_);
+               virtual Movie& captureThisFrame(int target_frame);
+               virtual Movie& captureThisFrame(const Rectangle &source_area_, int target_frame);
+               virtual Movie& save(std::string filename, const double fps = -1, const FOURCC codec = AUTO);
+               virtual Movie& saveFramesAsImages(std::string filename);
 
        };
 

diff --git a/psychlops/extension/standard/widgets/psychlops_widget.h b/psychlops/extension/standard/widgets/psychlops_widget.h
index 3bd57ad..186d611 100644 (file)
--- a/psychlops/extension/standard/widgets/psychlops_widget.h
+++ b/psychlops/extension/standard/widgets/psychlops_widget.h
@@ -1,5 +1,5 @@
 /*
- *  psychlops_widgets_prototype.h
+ *  psychlops_widget.h
  *  Psychlops Standard Library (Universal)
  *
  *  Last Modified 2009/02/15 by Kenchi HOSOKAWA
@@ -93,7 +93,7 @@ namespace Widgets {
                public:
                static int __LAST_TOTAL_REFRESH;
                static double __autoAlign_;
-               static void __autoAlign(WidgetRect &target);            
+               static void __autoAlign(WidgetRect &target);
 
                Theme *theme;
                Theme::TYPE_TAG theme_type;

diff --git a/psychlops/extension/standard/widgets/psychlops_widgets.h b/psychlops/extension/standard/widgets/psychlops_widgets.h
index 3ba2c5c..356aa7f 100644 (file)
--- a/psychlops/extension/standard/widgets/psychlops_widgets.h
+++ b/psychlops/extension/standard/widgets/psychlops_widgets.h
@@ -1,5 +1,5 @@
 /*
- *  psychlops_widgets_prototype.h
+ *  psychlops_widgets.h
  *  Psychlops Standard Library (Universal)
  *
  *  Last Modified 2009/02/15 by Kenchi HOSOKAWA

diff --git a/psychlops/platform/cv/psychlops_misc_opencv.cpp b/psychlops/platform/cv/psychlops_misc_opencv.cpp
index 86dc94a..3c18e02 100644 (file)
--- a/psychlops/platform/cv/psychlops_misc_opencv.cpp
+++ b/psychlops/platform/cv/psychlops_misc_opencv.cpp
@@ -14,7 +14,7 @@
 
 namespace Psychlops {\r
 \r
-       Figures::Movie& Figures::Movie::save(std::string filename, const double t_fps) {\r
+       Figures::Movie& Figures::Movie::save(std::string filename, const double t_fps, const FOURCC codec) {\r
                double fps;\r
                if(t_fps<=0.0) { fps = 60.0; } else { fps = t_fps; }\r
                if(frames.size()>0)\r
@@ -22,7 +22,40 @@ namespace Psychlops {
                        std::cout << "Movie::save : in progress...";\r
                        cv::Size size_of_frame(frames[0]->getWidth(), frames[0]->getHeight());\r
                        cv::Mat frame;\r
-                       cv::VideoWriter writer(filename, CV_FOURCC('X','V','I','D'), fps, size_of_frame);\r
+                       int fourcc = 0;\r
+                       switch(codec) {\r
+                       case AUTO:\r
+                               unsigned int loc;\r
+                               loc = filename.find(".avi",0);\r
+                               if( loc != std::string::npos ) { fourcc = CV_FOURCC('M','J','P','G'); break; }\r
+                               loc = filename.find(".mov",0);\r
+                               if( loc != std::string::npos ) { fourcc = CV_FOURCC('M','J','P','G'); break; }\r
+                               loc = filename.find(".m4v",0);\r
+                               if( loc != std::string::npos ) { fourcc = CV_FOURCC('M','P','4','V'); break; }\r
+                               break;\r
+                       case DIB:\r
+                               fourcc = CV_FOURCC('D','I','B',' ');\r
+                               break;\r
+                       case HFYU:\r
+                               fourcc = CV_FOURCC('H','F','Y','U');\r
+                               break;\r
+                       case PIM1:\r
+                               fourcc = CV_FOURCC('P','I','M','1');\r
+                               break;\r
+                       case MJPG:\r
+                               fourcc = CV_FOURCC('M','J','P','G');\r
+                               break;\r
+                       case DIVX:\r
+                               fourcc = CV_FOURCC('D','I','V','X');\r
+                               break;\r
+                       case XVID:\r
+                               fourcc = CV_FOURCC('X','V','I','D');\r
+                               break;\r
+                       case MP4V:\r
+                               fourcc = CV_FOURCC('M','P','4','V');\r
+                               break;\r
+                       }\r
+                       cv::VideoWriter writer(filename, fourcc, fps, size_of_frame);\r
                        for(int i=0; i<frames.size(); i++)\r
                        {\r
                                frames[i]->to(frame);\r

diff --git a/psychlops/platform/gl/extension/psychlops_g_shader_gl.cpp b/psychlops/platform/gl/extension/psychlops_g_shader_gl.cpp
index a040e1c..adb5fef 100644 (file)
--- a/psychlops/platform/gl/extension/psychlops_g_shader_gl.cpp
+++ b/psychlops/platform/gl/extension/psychlops_g_shader_gl.cpp
@@ -204,8 +204,7 @@ namespace Psychlops {
                        errormsg = logbuf;
                        delete [] logbuf;
                        throw new Exception(typeid(*this), "Shader compile failed", errormsg);
-               }\r
-std::cout << final_source << std::endl;
+               }
 \r
                if(gl2Program==0) gl2Program = glCreateProgram();
                glAttachShader(gl2Program, fragShader);

diff --git a/psychlops/platform/win32gl/psychlops_g_canvas_win32gl.cpp b/psychlops/platform/win32gl/psychlops_g_canvas_win32gl.cpp
index 35fa158..616531d 100644 (file)
--- a/psychlops/platform/win32gl/psychlops_g_canvas_win32gl.cpp
+++ b/psychlops/platform/win32gl/psychlops_g_canvas_win32gl.cpp
@@ -69,8 +69,24 @@ namespace Psychlops {
                        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
                        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 //                             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-//                             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-                       glTexImage2D(GL_TEXTURE_2D, 0, Image::PixCompSize_[img.pixcomp_], api_->tex_width, api_->tex_height, 0, APIImageProperties::PixCompGL_[img.pixcomp_], APIImageProperties::PixPrecGL_[img.pixprec_], tmp->getBitmapPtr());
+//                             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);\r
+                       GLenum vramFormat = Image::PixCompSize_[img.pixcomp_];\r
+                       /*\r
+                       if(img.pixprec_==Image::FLOAT) {\r
+                               switch(img.pixcomp_) {\r
+                               case Image::GRAY:\r
+                                       vramFormat = GL_R16UI;\r
+                                       break;\r
+                               case Image::RGB:\r
+                                       vramFormat = GL_RGB16UI;\r
+                                       break;\r
+                               case Image::RGBA:\r
+                                       vramFormat = GL_RGBA16UI;\r
+                                       break;\r
+                               }\r
+                       }\r
+                       */
+                       glTexImage2D(GL_TEXTURE_2D, 0, vramFormat, api_->tex_width, api_->tex_height, 0, APIImageProperties::PixCompGL_[img.pixcomp_], APIImageProperties::PixPrecGL_[img.pixprec_], tmp->getBitmapPtr());
                        glDisable(GL_TEXTURE_2D);
 
 //                             APIImageProperties::regist((int)Display::getWidth(), (int)Display::getHeight(), width_, height_, VRAMleft_, VRAMtop_);

diff --git a/win32gl/package/trunk/@EasyInstaller/psychlopswin32.pj2 b/win32gl/package/trunk/@EasyInstaller/psychlopswin32.pj2
index 1314b6b..41aea92 100644 (file)
--- a/win32gl/package/trunk/@EasyInstaller/psychlopswin32.pj2
+++ b/win32gl/package/trunk/@EasyInstaller/psychlopswin32.pj2
@@ -8,7 +8,7 @@ InstallerModuleLanguage=1041
 MajorVersion=4\r
 MinorVersion=1\r
 CreateDateTime=2005/12/22 15:09:29\r
-UpdateDateTime=2015/03/19 12:33:06\r
+UpdateDateTime=2015/04/02 23:06:31\r
 Generator=EINSTALL 2.0\r
 CreateFileType=4\r
 CreateFileAddVersionInfo=1\r

diff --git a/win32gl/package/trunk/@EasyInstaller/psychlopswin32_CB10.pj2 b/win32gl/package/trunk/@EasyInstaller/psychlopswin32_CB10.pj2
index 3f5c340..b3c623f 100644 (file)
--- a/win32gl/package/trunk/@EasyInstaller/psychlopswin32_CB10.pj2
+++ b/win32gl/package/trunk/@EasyInstaller/psychlopswin32_CB10.pj2
@@ -8,7 +8,7 @@ InstallerModuleLanguage=1041
 MajorVersion=4\r
 MinorVersion=1\r
 CreateDateTime=2005/12/22 15:09:29\r
-UpdateDateTime=2015/01/28 14:30:02\r
+UpdateDateTime=2015/04/02 23:10:19\r
 Generator=EINSTALL 2.0\r
 CreateFileType=4\r
 CreateFileAddVersionInfo=1\r
@@ -50,8 +50,8 @@ LogoNoCenter=0
 LogoNoHeaderMes=0\r
 LogoTransparent=0\r
 MajorVersion=1\r
-MinorVersion=6\r
-ReleaseVersion=3\r
+MinorVersion=7\r
+ReleaseVersion=0\r
 BuildVersion=0\r
 OtherVersion=0\r
 DocumentFile=Readme.txt\r

diff --git a/win32gl/package/trunk/@EasyInstaller/psychlopswin32_VC10.pj2 b/win32gl/package/trunk/@EasyInstaller/psychlopswin32_VC10.pj2
index d228000..167f87a 100644 (file)
--- a/win32gl/package/trunk/@EasyInstaller/psychlopswin32_VC10.pj2
+++ b/win32gl/package/trunk/@EasyInstaller/psychlopswin32_VC10.pj2
@@ -8,7 +8,7 @@ InstallerModuleLanguage=1041
 MajorVersion=4\r
 MinorVersion=1\r
 CreateDateTime=2005/12/22 15:09:29\r
-UpdateDateTime=2015/03/19 14:07:10\r
+UpdateDateTime=2015/03/31 16:47:10\r
 Generator=EINSTALL 2.0\r
 CreateFileType=4\r
 CreateFileAddVersionInfo=1\r
@@ -148,4 +148,42 @@ ExcludeCommonComponent=0
 \r
 [Files]\r
 0=1|0|%InstallDir%|Lib|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\Lib\psychlopswin32vc10.a|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+1=1|0|%InstallDir%|cv\lib\vc10|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\lib\vc10\opencv_calib3d249.lib|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+2=1|0|%InstallDir%|cv\lib\vc10|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\lib\vc10\opencv_contrib249.lib|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+3=1|0|%InstallDir%|cv\lib\vc10|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\lib\vc10\opencv_core249.lib|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+4=1|0|%InstallDir%|cv\lib\vc10|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\lib\vc10\opencv_features2d249.lib|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+5=1|0|%InstallDir%|cv\lib\vc10|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\lib\vc10\opencv_flann249.lib|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+6=1|0|%InstallDir%|cv\lib\vc10|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\lib\vc10\opencv_gpu249.lib|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+7=1|0|%InstallDir%|cv\lib\vc10|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\lib\vc10\opencv_highgui249.lib|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+8=1|0|%InstallDir%|cv\lib\vc10|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\lib\vc10\opencv_imgproc249.lib|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+9=1|0|%InstallDir%|cv\lib\vc10|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\lib\vc10\opencv_legacy249.lib|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+10=1|0|%InstallDir%|cv\lib\vc10|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\lib\vc10\opencv_ml249.lib|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+11=1|0|%InstallDir%|cv\lib\vc10|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\lib\vc10\opencv_nonfree249.lib|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+12=1|0|%InstallDir%|cv\lib\vc10|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\lib\vc10\opencv_objdetect249.lib|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+13=1|0|%InstallDir%|cv\lib\vc10|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\lib\vc10\opencv_ocl249.lib|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+14=1|0|%InstallDir%|cv\lib\vc10|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\lib\vc10\opencv_photo249.lib|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+15=1|0|%InstallDir%|cv\lib\vc10|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\lib\vc10\opencv_stitching249.lib|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+16=1|0|%InstallDir%|cv\lib\vc10|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\lib\vc10\opencv_superres249.lib|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+17=1|0|%InstallDir%|cv\lib\vc10|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\lib\vc10\opencv_ts249.lib|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+18=1|0|%InstallDir%|cv\lib\vc10|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\lib\vc10\opencv_video249.lib|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+19=1|0|%InstallDir%|cv\lib\vc10|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\lib\vc10\opencv_videostab249.lib|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+20=1|0|%InstallDir%|cv\bin|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\bin\opencv_calib3d249.dll|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+21=1|0|%InstallDir%|cv\bin|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\bin\opencv_contrib249.dll|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+22=1|0|%InstallDir%|cv\bin|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\bin\opencv_core249.dll|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+23=1|0|%InstallDir%|cv\bin|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\bin\opencv_features2d249.dll|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+24=1|0|%InstallDir%|cv\bin|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\bin\opencv_ffmpeg249.dll|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+25=1|0|%InstallDir%|cv\bin|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\bin\opencv_flann249.dll|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+26=1|0|%InstallDir%|cv\bin|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\bin\opencv_gpu249.dll|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+27=1|0|%InstallDir%|cv\bin|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\bin\opencv_highgui249.dll|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+28=1|0|%InstallDir%|cv\bin|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\bin\opencv_imgproc249.dll|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+29=1|0|%InstallDir%|cv\bin|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\bin\opencv_legacy249.dll|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+30=1|0|%InstallDir%|cv\bin|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\bin\opencv_ml249.dll|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+31=1|0|%InstallDir%|cv\bin|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\bin\opencv_nonfree249.dll|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+32=1|0|%InstallDir%|cv\bin|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\bin\opencv_objdetect249.dll|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+33=1|0|%InstallDir%|cv\bin|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\bin\opencv_ocl249.dll|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+34=1|0|%InstallDir%|cv\bin|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\bin\opencv_photo249.dll|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+35=1|0|%InstallDir%|cv\bin|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\bin\opencv_stitching249.dll|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+36=1|0|%InstallDir%|cv\bin|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\bin\opencv_superres249.dll|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+37=1|0|%InstallDir%|cv\bin|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\bin\opencv_video249.dll|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
+38=1|0|%InstallDir%|cv\bin|D:\Users\hskwk\Documents\Develop\Psychlops\cpp\master\win32gl\package\trunk\VC10\Library\Frameworks\Psychlops.framework\cv\bin\opencv_videostab249.dll|||0|0|496|0,4,2,1,0,0,,,,,,,,,,,,,,,||||||||||\r
 \r

diff --git a/win32gl/package/trunk/@EasyInstaller/psychlopswin32codeblockstemplate_10.05.pj2 b/win32gl/package/trunk/@EasyInstaller/psychlopswin32codeblockstemplate_10.05.pj2
index a6a2169..84f95c3 100644 (file)
--- a/win32gl/package/trunk/@EasyInstaller/psychlopswin32codeblockstemplate_10.05.pj2
+++ b/win32gl/package/trunk/@EasyInstaller/psychlopswin32codeblockstemplate_10.05.pj2
@@ -8,7 +8,7 @@ InstallerModuleLanguage=1041
 MajorVersion=4\r
 MinorVersion=1\r
 CreateDateTime=2005/12/22 15:09:29\r
-UpdateDateTime=2015/03/19 14:03:17\r
+UpdateDateTime=2015/04/02 23:05:53\r
 Generator=EINSTALL 2.0\r
 CreateFileType=4\r
 CreateFileAddVersionInfo=1\r
@@ -49,8 +49,8 @@ LogoNoCenter=0
 LogoNoHeaderMes=0\r
 LogoTransparent=0\r
 MajorVersion=1\r
-MinorVersion=5\r
-ReleaseVersion=5\r
+MinorVersion=7\r
+ReleaseVersion=0\r
 BuildVersion=0\r
 OtherVersion=0\r
 DocumentFile=readme.txt\r

diff --git a/win32gl/package/trunk/@EasyInstaller/psychlopswin32codeblockstemplate_12.11.pj2 b/win32gl/package/trunk/@EasyInstaller/psychlopswin32codeblockstemplate_12.11.pj2
index 9cd68c6..6bb936c 100644 (file)
--- a/win32gl/package/trunk/@EasyInstaller/psychlopswin32codeblockstemplate_12.11.pj2
+++ b/win32gl/package/trunk/@EasyInstaller/psychlopswin32codeblockstemplate_12.11.pj2
@@ -8,7 +8,7 @@ InstallerModuleLanguage=1041
 MajorVersion=4\r
 MinorVersion=1\r
 CreateDateTime=2005/12/22 15:09:29\r
-UpdateDateTime=2015/03/19 13:56:48\r
+UpdateDateTime=2015/04/02 23:05:37\r
 Generator=EINSTALL 2.0\r
 CreateFileType=4\r
 CreateFileAddVersionInfo=1\r
@@ -49,8 +49,8 @@ LogoNoCenter=0
 LogoNoHeaderMes=0\r
 LogoTransparent=0\r
 MajorVersion=1\r
-MinorVersion=6\r
-ReleaseVersion=2\r
+MinorVersion=7\r
+ReleaseVersion=0\r
 BuildVersion=0\r
 OtherVersion=0\r
 DocumentFile=readme.txt\r

diff --git a/win32gl/package/trunk/@EasyInstaller/psychlopswin32codeblockstemplate_13.12.pj2 b/win32gl/package/trunk/@EasyInstaller/psychlopswin32codeblockstemplate_13.12.pj2
index d9f2b57..0ed80dc 100644 (file)
--- a/win32gl/package/trunk/@EasyInstaller/psychlopswin32codeblockstemplate_13.12.pj2
+++ b/win32gl/package/trunk/@EasyInstaller/psychlopswin32codeblockstemplate_13.12.pj2
@@ -8,7 +8,7 @@ InstallerModuleLanguage=1041
 MajorVersion=4\r
 MinorVersion=1\r
 CreateDateTime=2005/12/22 15:09:29\r
-UpdateDateTime=2015/03/19 14:00:55\r
+UpdateDateTime=2015/04/02 23:06:19\r
 Generator=EINSTALL 2.0\r
 CreateFileType=4\r
 CreateFileAddVersionInfo=1\r
@@ -49,8 +49,8 @@ LogoNoCenter=0
 LogoNoHeaderMes=0\r
 LogoTransparent=0\r
 MajorVersion=1\r
-MinorVersion=6\r
-ReleaseVersion=4\r
+MinorVersion=7\r
+ReleaseVersion=0\r
 BuildVersion=0\r
 OtherVersion=0\r
 DocumentFile=readme.txt\r

diff --git a/win32gl/package/trunk/@EasyInstaller/psychlopswin32codeblockstemplate_8.02.pj2 b/win32gl/package/trunk/@EasyInstaller/psychlopswin32codeblockstemplate_8.02.pj2
index 925b483..056f608 100644 (file)
--- a/win32gl/package/trunk/@EasyInstaller/psychlopswin32codeblockstemplate_8.02.pj2
+++ b/win32gl/package/trunk/@EasyInstaller/psychlopswin32codeblockstemplate_8.02.pj2
@@ -8,7 +8,7 @@ InstallerModuleLanguage=1041
 MajorVersion=4\r
 MinorVersion=1\r
 CreateDateTime=2005/12/22 15:09:29\r
-UpdateDateTime=2015/03/19 14:05:49\r
+UpdateDateTime=2015/04/02 23:06:06\r
 Generator=EINSTALL 2.0\r
 CreateFileType=4\r
 CreateFileAddVersionInfo=1\r
@@ -49,8 +49,8 @@ LogoNoCenter=0
 LogoNoHeaderMes=0\r
 LogoTransparent=0\r
 MajorVersion=1\r
-MinorVersion=5\r
-ReleaseVersion=5\r
+MinorVersion=7\r
+ReleaseVersion=0\r
 BuildVersion=0\r
 OtherVersion=0\r
 DocumentFile=readme.txt\r

diff --git a/win32gl/package/trunk/CB10.05/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script b/win32gl/package/trunk/CB10.05/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script
index 94082c2..ac5717e 100644 (file)
--- a/win32gl/package/trunk/CB10.05/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script
+++ b/win32gl/package/trunk/CB10.05/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script
@@ -35,9 +35,29 @@ function SetupProject(project)
         // add link libraries
         if (GetCompilerFactory().CompilerInheritsFrom(Wizard.GetCompilerID(), _T("gcc")))
         {
+            project.AddLibDir(_T("%SystemDrive%\\Library\\Frameworks\\Psychlops.framework\\cv\\lib\\mingw4"));
             project.AddLinkLib(_T("libpsychlopswin32gcc.a"));
             project.AddLinkLib(_T("libpng_mingw.a"));
             project.AddLinkLib(_T("libfftw3.a"));
+            project.AddLinkLib(_T("libopencv_calib3d249.dll.a"));
+            project.AddLinkLib(_T("libopencv_contrib249.dll.a"));
+            project.AddLinkLib(_T("libopencv_core249.dll.a"));
+            project.AddLinkLib(_T("libopencv_features2d249.dll.a"));
+            project.AddLinkLib(_T("libopencv_flann249.dll.a"));
+            project.AddLinkLib(_T("libopencv_gpu249.dll.a"));
+            project.AddLinkLib(_T("libopencv_haartraining_engine.a"));
+            project.AddLinkLib(_T("libopencv_highgui249.dll.a"));
+            project.AddLinkLib(_T("libopencv_imgproc249.dll.a"));
+            project.AddLinkLib(_T("libopencv_legacy249.dll.a"));
+            project.AddLinkLib(_T("libopencv_ml249.dll.a"));
+            project.AddLinkLib(_T("libopencv_nonfree249.dll.a"));
+            project.AddLinkLib(_T("libopencv_objdetect249.dll.a"));
+            project.AddLinkLib(_T("libopencv_ocl249.dll.a"));
+            project.AddLinkLib(_T("libopencv_photo249.dll.a"));
+            project.AddLinkLib(_T("libopencv_stitching249.dll.a"));
+            project.AddLinkLib(_T("libopencv_superres249.dll.a"));
+            project.AddLinkLib(_T("libopencv_video249.dll.a"));
+            project.AddLinkLib(_T("libopencv_videostab249.dll.a"));
         }
         project.AddLinkLib(_T("kernel32"));
         project.AddLinkLib(_T("opengl32"));
@@ -48,12 +68,32 @@ function SetupProject(project)
         project.AddLinkLib(_T("comdlg32"));
         if (GetCompilerFactory().CompilerInheritsFrom(Wizard.GetCompilerID(), _T("msvc8")))
         {
+            project.AddLibDir(_T("%SystemDrive%\\Library\\Frameworks\\Psychlops.framework\\cv\\lib\\vc10"));
             project.AddLinkLib(_T("psychlopswin32vc9.lib"));
             project.AddLinkLib(_T("libpng_vc9.lib"));
             project.AddLinkLib(_T("libfftw3_vc9.lib"));
             project.AddCompilerOption(_T("/GR"));
             project.AddCompilerOption(_T("/EHs"));
             project.AddCompilerOption(_T("/GA"));
+            project.AddLinkLib(_T("opencv_calib3d249.lib"));
+            project.AddLinkLib(_T("opencv_contrib249.lib"));
+            project.AddLinkLib(_T("opencv_core249.lib"));
+            project.AddLinkLib(_T("opencv_features2d249.lib"));
+            project.AddLinkLib(_T("opencv_flann249.lib"));
+            project.AddLinkLib(_T("opencv_gpu249.lib"));
+            project.AddLinkLib(_T("opencv_haartraining_engine.a"));
+            project.AddLinkLib(_T("opencv_highgui249.lib"));
+            project.AddLinkLib(_T("opencv_imgproc249.lib"));
+            project.AddLinkLib(_T("opencv_legacy249.lib"));
+            project.AddLinkLib(_T("opencv_ml249.lib"));
+            project.AddLinkLib(_T("opencv_nonfree249.lib"));
+            project.AddLinkLib(_T("opencv_objdetect249.lib"));
+            project.AddLinkLib(_T("opencv_ocl249.lib"));
+            project.AddLinkLib(_T("opencv_photo249.lib"));
+            project.AddLinkLib(_T("opencv_stitching249.lib"));
+            project.AddLinkLib(_T("opencv_superres249.lib"));
+            project.AddLinkLib(_T("opencv_video249.lib"));
+            project.AddLinkLib(_T("opencv_videostab249.lib"));
         }
         else if (GetCompilerFactory().CompilerInheritsFrom(Wizard.GetCompilerID(), _T("bcc")))
         {

diff --git a/win32gl/package/trunk/CB12.11/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script b/win32gl/package/trunk/CB12.11/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script
index b42ac90..aff45ce 100644 (file)
--- a/win32gl/package/trunk/CB12.11/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script
+++ b/win32gl/package/trunk/CB12.11/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script
@@ -32,11 +32,11 @@ function SetupProject(project)
         project.AddLibDir(_T("%SystemDrive%\\Library\\Frameworks\\Psychlops.framework\\Lib"));
         project.AddLibDir(_T("%SystemDrive%\\Library\\Frameworks\\Psychlops.framework\\Lib\\extension"));
         project.AddIncludeDir(_T("%SystemDrive%\\Library\\Frameworks\\Psychlops.framework\\cv\\include"));
-        project.AddLibDir(_T("%SystemDrive%\\Library\\Frameworks\\Psychlops.framework\\cv\\lib\\mingw4"));
 
         // add link libraries
         if (GetCompilerFactory().CompilerInheritsFrom(Wizard.GetCompilerID(), _T("gcc")))
         {
+            project.AddLibDir(_T("%SystemDrive%\\Library\\Frameworks\\Psychlops.framework\\cv\\lib\\mingw4"));
             project.AddLinkLib(_T("libpsychlopswin32gcc.a"));
             project.AddLinkLib(_T("libpng_mingw.a"));
             project.AddLinkLib(_T("libfftw3.a"));
@@ -69,12 +69,32 @@ function SetupProject(project)
         project.AddLinkLib(_T("comdlg32"));
         if (GetCompilerFactory().CompilerInheritsFrom(Wizard.GetCompilerID(), _T("msvc8")))
         {
+            project.AddLibDir(_T("%SystemDrive%\\Library\\Frameworks\\Psychlops.framework\\cv\\lib\\vc10"));
             project.AddLinkLib(_T("psychlopswin32vc9.lib"));
             project.AddLinkLib(_T("libpng_vc9.lib"));
             project.AddLinkLib(_T("libfftw3_vc9.lib"));
             project.AddCompilerOption(_T("/GR"));
             project.AddCompilerOption(_T("/EHs"));
             project.AddCompilerOption(_T("/GA"));
+            project.AddLinkLib(_T("opencv_calib3d249.lib"));
+            project.AddLinkLib(_T("opencv_contrib249.lib"));
+            project.AddLinkLib(_T("opencv_core249.lib"));
+            project.AddLinkLib(_T("opencv_features2d249.lib"));
+            project.AddLinkLib(_T("opencv_flann249.lib"));
+            project.AddLinkLib(_T("opencv_gpu249.lib"));
+            project.AddLinkLib(_T("opencv_haartraining_engine.a"));
+            project.AddLinkLib(_T("opencv_highgui249.lib"));
+            project.AddLinkLib(_T("opencv_imgproc249.lib"));
+            project.AddLinkLib(_T("opencv_legacy249.lib"));
+            project.AddLinkLib(_T("opencv_ml249.lib"));
+            project.AddLinkLib(_T("opencv_nonfree249.lib"));
+            project.AddLinkLib(_T("opencv_objdetect249.lib"));
+            project.AddLinkLib(_T("opencv_ocl249.lib"));
+            project.AddLinkLib(_T("opencv_photo249.lib"));
+            project.AddLinkLib(_T("opencv_stitching249.lib"));
+            project.AddLinkLib(_T("opencv_superres249.lib"));
+            project.AddLinkLib(_T("opencv_video249.lib"));
+            project.AddLinkLib(_T("opencv_videostab249.lib"));
         }
         else if (GetCompilerFactory().CompilerInheritsFrom(Wizard.GetCompilerID(), _T("bcc")))
         {

diff --git a/win32gl/package/trunk/CB13.12/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script b/win32gl/package/trunk/CB13.12/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script
index b42ac90..aff45ce 100644 (file)
--- a/win32gl/package/trunk/CB13.12/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script
+++ b/win32gl/package/trunk/CB13.12/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script
@@ -32,11 +32,11 @@ function SetupProject(project)
         project.AddLibDir(_T("%SystemDrive%\\Library\\Frameworks\\Psychlops.framework\\Lib"));
         project.AddLibDir(_T("%SystemDrive%\\Library\\Frameworks\\Psychlops.framework\\Lib\\extension"));
         project.AddIncludeDir(_T("%SystemDrive%\\Library\\Frameworks\\Psychlops.framework\\cv\\include"));
-        project.AddLibDir(_T("%SystemDrive%\\Library\\Frameworks\\Psychlops.framework\\cv\\lib\\mingw4"));
 
         // add link libraries
         if (GetCompilerFactory().CompilerInheritsFrom(Wizard.GetCompilerID(), _T("gcc")))
         {
+            project.AddLibDir(_T("%SystemDrive%\\Library\\Frameworks\\Psychlops.framework\\cv\\lib\\mingw4"));
             project.AddLinkLib(_T("libpsychlopswin32gcc.a"));
             project.AddLinkLib(_T("libpng_mingw.a"));
             project.AddLinkLib(_T("libfftw3.a"));
@@ -69,12 +69,32 @@ function SetupProject(project)
         project.AddLinkLib(_T("comdlg32"));
         if (GetCompilerFactory().CompilerInheritsFrom(Wizard.GetCompilerID(), _T("msvc8")))
         {
+            project.AddLibDir(_T("%SystemDrive%\\Library\\Frameworks\\Psychlops.framework\\cv\\lib\\vc10"));
             project.AddLinkLib(_T("psychlopswin32vc9.lib"));
             project.AddLinkLib(_T("libpng_vc9.lib"));
             project.AddLinkLib(_T("libfftw3_vc9.lib"));
             project.AddCompilerOption(_T("/GR"));
             project.AddCompilerOption(_T("/EHs"));
             project.AddCompilerOption(_T("/GA"));
+            project.AddLinkLib(_T("opencv_calib3d249.lib"));
+            project.AddLinkLib(_T("opencv_contrib249.lib"));
+            project.AddLinkLib(_T("opencv_core249.lib"));
+            project.AddLinkLib(_T("opencv_features2d249.lib"));
+            project.AddLinkLib(_T("opencv_flann249.lib"));
+            project.AddLinkLib(_T("opencv_gpu249.lib"));
+            project.AddLinkLib(_T("opencv_haartraining_engine.a"));
+            project.AddLinkLib(_T("opencv_highgui249.lib"));
+            project.AddLinkLib(_T("opencv_imgproc249.lib"));
+            project.AddLinkLib(_T("opencv_legacy249.lib"));
+            project.AddLinkLib(_T("opencv_ml249.lib"));
+            project.AddLinkLib(_T("opencv_nonfree249.lib"));
+            project.AddLinkLib(_T("opencv_objdetect249.lib"));
+            project.AddLinkLib(_T("opencv_ocl249.lib"));
+            project.AddLinkLib(_T("opencv_photo249.lib"));
+            project.AddLinkLib(_T("opencv_stitching249.lib"));
+            project.AddLinkLib(_T("opencv_superres249.lib"));
+            project.AddLinkLib(_T("opencv_video249.lib"));
+            project.AddLinkLib(_T("opencv_videostab249.lib"));
         }
         else if (GetCompilerFactory().CompilerInheritsFrom(Wizard.GetCompilerID(), _T("bcc")))
         {

diff --git a/win32gl/package/trunk/CB8.02/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script b/win32gl/package/trunk/CB8.02/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script
index 5e4127b..fd2adef 100644 (file)
--- a/win32gl/package/trunk/CB8.02/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script
+++ b/win32gl/package/trunk/CB8.02/Program Files/Codeblocks/share/CodeBlocks/templates/wizard/PsychlopsGL/wizard.script
@@ -35,9 +35,29 @@ function SetupProject(project)
         // add link libraries
         if (GetCompilerFactory().CompilerInheritsFrom(Wizard.GetCompilerID(), _T("gcc")))
         {
+            project.AddLibDir(_T("%SystemDrive%\\Library\\Frameworks\\Psychlops.framework\\cv\\lib\\mingw4"));
             project.AddLinkLib(_T("libpsychlopswin32gcc.a"));
             project.AddLinkLib(_T("libpng_mingw.a"));
             project.AddLinkLib(_T("libfftw3.a"));
+            project.AddLinkLib(_T("libopencv_calib3d249.dll.a"));
+            project.AddLinkLib(_T("libopencv_contrib249.dll.a"));
+            project.AddLinkLib(_T("libopencv_core249.dll.a"));
+            project.AddLinkLib(_T("libopencv_features2d249.dll.a"));
+            project.AddLinkLib(_T("libopencv_flann249.dll.a"));
+            project.AddLinkLib(_T("libopencv_gpu249.dll.a"));
+            project.AddLinkLib(_T("libopencv_haartraining_engine.a"));
+            project.AddLinkLib(_T("libopencv_highgui249.dll.a"));
+            project.AddLinkLib(_T("libopencv_imgproc249.dll.a"));
+            project.AddLinkLib(_T("libopencv_legacy249.dll.a"));
+            project.AddLinkLib(_T("libopencv_ml249.dll.a"));
+            project.AddLinkLib(_T("libopencv_nonfree249.dll.a"));
+            project.AddLinkLib(_T("libopencv_objdetect249.dll.a"));
+            project.AddLinkLib(_T("libopencv_ocl249.dll.a"));
+            project.AddLinkLib(_T("libopencv_photo249.dll.a"));
+            project.AddLinkLib(_T("libopencv_stitching249.dll.a"));
+            project.AddLinkLib(_T("libopencv_superres249.dll.a"));
+            project.AddLinkLib(_T("libopencv_video249.dll.a"));
+            project.AddLinkLib(_T("libopencv_videostab249.dll.a"));
         }
         project.AddLinkLib(_T("kernel32"));
         project.AddLinkLib(_T("opengl32"));
@@ -48,12 +68,32 @@ function SetupProject(project)
         project.AddLinkLib(_T("comdlg32"));
         if (GetCompilerFactory().CompilerInheritsFrom(Wizard.GetCompilerID(), _T("msvc*")))
         {
+            project.AddLibDir(_T("%SystemDrive%\\Library\\Frameworks\\Psychlops.framework\\cv\\lib\\vc10"));
             project.AddLinkLib(_T("psychlopswin32vc9.lib"));
             project.AddLinkLib(_T("libpng_vc9.lib"));
             project.AddLinkLib(_T("libfftw3_vc9.lib"));
             project.AddCompilerOption(_T("/GR"));
             project.AddCompilerOption(_T("/EHs"));
             project.AddCompilerOption(_T("/GA"));
+            project.AddLinkLib(_T("opencv_calib3d249.lib"));
+            project.AddLinkLib(_T("opencv_contrib249.lib"));
+            project.AddLinkLib(_T("opencv_core249.lib"));
+            project.AddLinkLib(_T("opencv_features2d249.lib"));
+            project.AddLinkLib(_T("opencv_flann249.lib"));
+            project.AddLinkLib(_T("opencv_gpu249.lib"));
+            project.AddLinkLib(_T("opencv_haartraining_engine.a"));
+            project.AddLinkLib(_T("opencv_highgui249.lib"));
+            project.AddLinkLib(_T("opencv_imgproc249.lib"));
+            project.AddLinkLib(_T("opencv_legacy249.lib"));
+            project.AddLinkLib(_T("opencv_ml249.lib"));
+            project.AddLinkLib(_T("opencv_nonfree249.lib"));
+            project.AddLinkLib(_T("opencv_objdetect249.lib"));
+            project.AddLinkLib(_T("opencv_ocl249.lib"));
+            project.AddLinkLib(_T("opencv_photo249.lib"));
+            project.AddLinkLib(_T("opencv_stitching249.lib"));
+            project.AddLinkLib(_T("opencv_superres249.lib"));
+            project.AddLinkLib(_T("opencv_video249.lib"));
+            project.AddLinkLib(_T("opencv_videostab249.lib"));
         }
         else if (GetCompilerFactory().CompilerInheritsFrom(Wizard.GetCompilerID(), _T("bcc")))
         {

diff --git a/win32gl/package/trunk/Library/Frameworks/Psychlops.framework/License.txt b/win32gl/package/trunk/Library/Frameworks/Psychlops.framework/License.txt
index 3e664bd..ec29ed3 100644 (file)
--- a/win32gl/package/trunk/Library/Frameworks/Psychlops.framework/License.txt
+++ b/win32gl/package/trunk/Library/Frameworks/Psychlops.framework/License.txt
@@ -1,8 +1,8 @@
 Psychlops \97\98\97p\8b\96\91ø\8c_\96ñ\r
-Copyright (C) 2008-2014, HOSOKAWA Kenchi and MARUYA Kazushi\r
+Copyright (C) 2008-2015, HOSOKAWA Kenchi and MARUYA Kazushi\r
 \r
 \r
-\96{\83v\83\8d\83O\83\89\83\80\82ÍGPLv3\82Ì\8fð\8d\80\82É\8f]\82Á\82Ä\83\89\83C\83Z\83\93\83X\82·\82é\81B\r
+\96{\83v\83\8d\83O\83\89\83\80\82ÍFFTW\82ð\8eg\97p\82µ\82Ä\82¨\82è\81AFFTW\82ÌGPLv3\82Ì\8a´\90õ\8fð\8d\80\82É\8f]\82Á\82ÄGPLv3\82É\82æ\82è\83\89\83C\83Z\83\93\83X\82·\82é\81B\r
 http://www.gnu.org/copyleft/gpl.html\r
 \r
 \r
@@ -11,7 +11,8 @@ License_without_FFTW.txt
 \r
 \r
 \96{\83\\83t\83g\83E\83F\83A\82É\8aÜ\82Ü\82ê\82é\83\\81[\83X\83R\81[\83h\82¨\82æ\82Ñ\83o\83C\83i\83\8a\82Í\81A\8ae\92\98\8dì\8eÒ\82Ì\8ew\92è\82·\82é\97\98\97p\8b\96\91ø\8c_\96ñ\82É\8f]\82¤\81B\8aY\93\96\82·\82é\95\94\95ª\82Æ\82»\82Ì\97\98\97p\8b\96\91ø\8c_\96ñ\82ð\8bL\82µ\82½\93Y\95t\83t\83@\83C\83\8b\82ð\88È\89º\82É\8e¦\82·\81B\r
-zlib    license_zlib.txt\r
-libpng  license_libpng.txt\r
-dSFMT   license_dSFMT.txt\r
-FFTW    license_FFTW.txt\r
+zlib    License_zlib.txt\r
+libpng  License_libpng.txt\r
+dSFMT   License_dSFMT.txt\r
+FFTW    License_FFTW.txt\r
+OpenCV  License_OpenCV.txt
\ No newline at end of file

diff --git a/win32gl/package/trunk/Library/Frameworks/Psychlops.framework/Readme.txt b/win32gl/package/trunk/Library/Frameworks/Psychlops.framework/Readme.txt
index 4667f2b..2db7d2b 100644 (file)
--- a/win32gl/package/trunk/Library/Frameworks/Psychlops.framework/Readme.txt
+++ b/win32gl/package/trunk/Library/Frameworks/Psychlops.framework/Readme.txt
@@ -1,7 +1,7 @@
 Psychlops framework Win32 OpenGL\r
 \r
-version: 1.6.3\r
-build:   20140401\r
+version: 1.7.0\r
+build:   20150401\r
 \r
 \r
 Psychlops\96{\91Ì\82Ì\83C\83\93\83X\83g\81[\83\8b\82ð\8aJ\8en\82µ\82Ü\82·\81B\r

diff --git a/win32gl/test/compilenew.cpp b/win32gl/test/compilenew.cpp
index 2f42b04..c1ae204 100644 (file)
--- a/win32gl/test/compilenew.cpp
+++ b/win32gl/test/compilenew.cpp
@@ -5,7 +5,6 @@
 // Current Biology, 10, 679-682.\r
 ///+ Prefix\r
 //// Include Psychlops Package\r
-#define PSYCHLOPS_USE_NIDAQ_MX\r
 #include <psychlops.h>\r
 using namespace Psychlops;    // Initially developed with Psychlops Win32 1.5.3 / 20110311\r
 ///- Prefix\r
@@ -24,7 +23,6 @@ void psychlops_main() {
        rect.fill = Color::red;\r
 \r
        Devices::GenericParallelPort trigger("USB_PARALLEL", 1+8);\r
-       Devices::NIDAQmx nidaq();\r
 \r
        int t=0;\r
 \r