From 027a6c9c0b8bc066ae5494a0ca1689ab2a767a61 Mon Sep 17 00:00:00 2001 From: hskwk Date: Thu, 2 Apr 2015 23:13:36 +0900 Subject: [PATCH] 1.7.0 --- .../standard/figure/psychlops_figure_standard.cpp | 16 ++++----- .../standard/figure/psychlops_figure_standard.h | 15 ++++---- .../extension/standard/widgets/psychlops_widget.h | 4 +-- .../extension/standard/widgets/psychlops_widgets.h | 2 +- psychlops/platform/cv/psychlops_misc_opencv.cpp | 37 ++++++++++++++++++-- .../gl/extension/psychlops_g_shader_gl.cpp | 3 +- .../win32gl/psychlops_g_canvas_win32gl.cpp | 20 +++++++++-- .../trunk/@EasyInstaller/psychlopswin32.pj2 | 2 +- .../trunk/@EasyInstaller/psychlopswin32_CB10.pj2 | 6 ++-- .../trunk/@EasyInstaller/psychlopswin32_VC10.pj2 | 40 +++++++++++++++++++++- .../psychlopswin32codeblockstemplate_10.05.pj2 | 6 ++-- .../psychlopswin32codeblockstemplate_12.11.pj2 | 6 ++-- .../psychlopswin32codeblockstemplate_13.12.pj2 | 6 ++-- .../psychlopswin32codeblockstemplate_8.02.pj2 | 6 ++-- .../templates/wizard/PsychlopsGL/wizard.script | 40 ++++++++++++++++++++++ .../templates/wizard/PsychlopsGL/wizard.script | 22 +++++++++++- .../templates/wizard/PsychlopsGL/wizard.script | 22 +++++++++++- .../templates/wizard/PsychlopsGL/wizard.script | 40 ++++++++++++++++++++++ .../Frameworks/Psychlops.framework/License.txt | 13 +++---- .../Frameworks/Psychlops.framework/Readme.txt | 4 +-- win32gl/test/compilenew.cpp | 2 -- 21 files changed, 259 insertions(+), 53 deletions(-) diff --git a/psychlops/extension/standard/figure/psychlops_figure_standard.cpp b/psychlops/extension/standard/figure/psychlops_figure_standard.cpp index ffc150f..b1663af 100644 --- 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; isave(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 --- 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 frames; - public: + public: + 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 --- 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 --- 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 --- a/psychlops/platform/cv/psychlops_misc_opencv.cpp +++ b/psychlops/platform/cv/psychlops_misc_opencv.cpp @@ -14,7 +14,7 @@ namespace Psychlops { - Figures::Movie& Figures::Movie::save(std::string filename, const double t_fps) { + Figures::Movie& Figures::Movie::save(std::string filename, const double t_fps, const FOURCC codec) { double fps; if(t_fps<=0.0) { fps = 60.0; } else { fps = t_fps; } if(frames.size()>0) @@ -22,7 +22,40 @@ namespace Psychlops { std::cout << "Movie::save : in progress..."; cv::Size size_of_frame(frames[0]->getWidth(), frames[0]->getHeight()); cv::Mat frame; - cv::VideoWriter writer(filename, CV_FOURCC('X','V','I','D'), fps, size_of_frame); + int fourcc = 0; + switch(codec) { + case AUTO: + unsigned int loc; + loc = filename.find(".avi",0); + if( loc != std::string::npos ) { fourcc = CV_FOURCC('M','J','P','G'); break; } + loc = filename.find(".mov",0); + if( loc != std::string::npos ) { fourcc = CV_FOURCC('M','J','P','G'); break; } + loc = filename.find(".m4v",0); + if( loc != std::string::npos ) { fourcc = CV_FOURCC('M','P','4','V'); break; } + break; + case DIB: + fourcc = CV_FOURCC('D','I','B',' '); + break; + case HFYU: + fourcc = CV_FOURCC('H','F','Y','U'); + break; + case PIM1: + fourcc = CV_FOURCC('P','I','M','1'); + break; + case MJPG: + fourcc = CV_FOURCC('M','J','P','G'); + break; + case DIVX: + fourcc = CV_FOURCC('D','I','V','X'); + break; + case XVID: + fourcc = CV_FOURCC('X','V','I','D'); + break; + case MP4V: + fourcc = CV_FOURCC('M','P','4','V'); + break; + } + cv::VideoWriter writer(filename, fourcc, fps, size_of_frame); for(int i=0; ito(frame); 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 --- 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); - } -std::cout << final_source << std::endl; + } 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 --- 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); + GLenum vramFormat = Image::PixCompSize_[img.pixcomp_]; + /* + if(img.pixprec_==Image::FLOAT) { + switch(img.pixcomp_) { + case Image::GRAY: + vramFormat = GL_R16UI; + break; + case Image::RGB: + vramFormat = GL_RGB16UI; + break; + case Image::RGBA: + vramFormat = GL_RGBA16UI; + break; + } + } + */ + 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 --- a/win32gl/package/trunk/@EasyInstaller/psychlopswin32.pj2 +++ b/win32gl/package/trunk/@EasyInstaller/psychlopswin32.pj2 @@ -8,7 +8,7 @@ InstallerModuleLanguage=1041 MajorVersion=4 MinorVersion=1 CreateDateTime=2005/12/22 15:09:29 -UpdateDateTime=2015/03/19 12:33:06 +UpdateDateTime=2015/04/02 23:06:31 Generator=EINSTALL 2.0 CreateFileType=4 CreateFileAddVersionInfo=1 diff --git a/win32gl/package/trunk/@EasyInstaller/psychlopswin32_CB10.pj2 b/win32gl/package/trunk/@EasyInstaller/psychlopswin32_CB10.pj2 index 3f5c340..b3c623f 100644 --- a/win32gl/package/trunk/@EasyInstaller/psychlopswin32_CB10.pj2 +++ b/win32gl/package/trunk/@EasyInstaller/psychlopswin32_CB10.pj2 @@ -8,7 +8,7 @@ InstallerModuleLanguage=1041 MajorVersion=4 MinorVersion=1 CreateDateTime=2005/12/22 15:09:29 -UpdateDateTime=2015/01/28 14:30:02 +UpdateDateTime=2015/04/02 23:10:19 Generator=EINSTALL 2.0 CreateFileType=4 CreateFileAddVersionInfo=1 @@ -50,8 +50,8 @@ LogoNoCenter=0 LogoNoHeaderMes=0 LogoTransparent=0 MajorVersion=1 -MinorVersion=6 -ReleaseVersion=3 +MinorVersion=7 +ReleaseVersion=0 BuildVersion=0 OtherVersion=0 DocumentFile=Readme.txt diff --git a/win32gl/package/trunk/@EasyInstaller/psychlopswin32_VC10.pj2 b/win32gl/package/trunk/@EasyInstaller/psychlopswin32_VC10.pj2 index d228000..167f87a 100644 --- a/win32gl/package/trunk/@EasyInstaller/psychlopswin32_VC10.pj2 +++ b/win32gl/package/trunk/@EasyInstaller/psychlopswin32_VC10.pj2 @@ -8,7 +8,7 @@ InstallerModuleLanguage=1041 MajorVersion=4 MinorVersion=1 CreateDateTime=2005/12/22 15:09:29 -UpdateDateTime=2015/03/19 14:07:10 +UpdateDateTime=2015/03/31 16:47:10 Generator=EINSTALL 2.0 CreateFileType=4 CreateFileAddVersionInfo=1 @@ -148,4 +148,42 @@ ExcludeCommonComponent=0 [Files] 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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| +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,,,,,,,,,,,,,,,|||||||||| diff --git a/win32gl/package/trunk/@EasyInstaller/psychlopswin32codeblockstemplate_10.05.pj2 b/win32gl/package/trunk/@EasyInstaller/psychlopswin32codeblockstemplate_10.05.pj2 index a6a2169..84f95c3 100644 --- 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 MinorVersion=1 CreateDateTime=2005/12/22 15:09:29 -UpdateDateTime=2015/03/19 14:03:17 +UpdateDateTime=2015/04/02 23:05:53 Generator=EINSTALL 2.0 CreateFileType=4 CreateFileAddVersionInfo=1 @@ -49,8 +49,8 @@ LogoNoCenter=0 LogoNoHeaderMes=0 LogoTransparent=0 MajorVersion=1 -MinorVersion=5 -ReleaseVersion=5 +MinorVersion=7 +ReleaseVersion=0 BuildVersion=0 OtherVersion=0 DocumentFile=readme.txt diff --git a/win32gl/package/trunk/@EasyInstaller/psychlopswin32codeblockstemplate_12.11.pj2 b/win32gl/package/trunk/@EasyInstaller/psychlopswin32codeblockstemplate_12.11.pj2 index 9cd68c6..6bb936c 100644 --- 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 MinorVersion=1 CreateDateTime=2005/12/22 15:09:29 -UpdateDateTime=2015/03/19 13:56:48 +UpdateDateTime=2015/04/02 23:05:37 Generator=EINSTALL 2.0 CreateFileType=4 CreateFileAddVersionInfo=1 @@ -49,8 +49,8 @@ LogoNoCenter=0 LogoNoHeaderMes=0 LogoTransparent=0 MajorVersion=1 -MinorVersion=6 -ReleaseVersion=2 +MinorVersion=7 +ReleaseVersion=0 BuildVersion=0 OtherVersion=0 DocumentFile=readme.txt diff --git a/win32gl/package/trunk/@EasyInstaller/psychlopswin32codeblockstemplate_13.12.pj2 b/win32gl/package/trunk/@EasyInstaller/psychlopswin32codeblockstemplate_13.12.pj2 index d9f2b57..0ed80dc 100644 --- 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 MinorVersion=1 CreateDateTime=2005/12/22 15:09:29 -UpdateDateTime=2015/03/19 14:00:55 +UpdateDateTime=2015/04/02 23:06:19 Generator=EINSTALL 2.0 CreateFileType=4 CreateFileAddVersionInfo=1 @@ -49,8 +49,8 @@ LogoNoCenter=0 LogoNoHeaderMes=0 LogoTransparent=0 MajorVersion=1 -MinorVersion=6 -ReleaseVersion=4 +MinorVersion=7 +ReleaseVersion=0 BuildVersion=0 OtherVersion=0 DocumentFile=readme.txt diff --git a/win32gl/package/trunk/@EasyInstaller/psychlopswin32codeblockstemplate_8.02.pj2 b/win32gl/package/trunk/@EasyInstaller/psychlopswin32codeblockstemplate_8.02.pj2 index 925b483..056f608 100644 --- 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 MinorVersion=1 CreateDateTime=2005/12/22 15:09:29 -UpdateDateTime=2015/03/19 14:05:49 +UpdateDateTime=2015/04/02 23:06:06 Generator=EINSTALL 2.0 CreateFileType=4 CreateFileAddVersionInfo=1 @@ -49,8 +49,8 @@ LogoNoCenter=0 LogoNoHeaderMes=0 LogoTransparent=0 MajorVersion=1 -MinorVersion=5 -ReleaseVersion=5 +MinorVersion=7 +ReleaseVersion=0 BuildVersion=0 OtherVersion=0 DocumentFile=readme.txt 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 --- 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 --- 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 --- 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 --- 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 --- 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 —˜—p‹–‘øŒ_–ñ -Copyright (C) 2008-2014, HOSOKAWA Kenchi and MARUYA Kazushi +Copyright (C) 2008-2015, HOSOKAWA Kenchi and MARUYA Kazushi -–{ƒvƒƒOƒ‰ƒ€‚ÍGPLv3‚Ìð€‚É]‚Á‚ă‰ƒCƒZƒ“ƒX‚·‚éB +–{ƒvƒƒOƒ‰ƒ€‚ÍFFTW‚ðŽg—p‚µ‚Ä‚¨‚èAFFTW‚ÌGPLv3‚ÌŠ´õð€‚ɏ]‚Á‚ÄGPLv3‚É‚æ‚胉ƒCƒZƒ“ƒX‚·‚éB http://www.gnu.org/copyleft/gpl.html @@ -11,7 +11,8 @@ License_without_FFTW.txt –{ƒ\ƒtƒgƒEƒFƒA‚ÉŠÜ‚Ü‚ê‚éƒ\[ƒXƒR[ƒh‚¨‚æ‚уoƒCƒiƒŠ‚́AŠe’˜ìŽÒ‚ÌŽw’è‚·‚é—˜—p‹–‘øŒ_–ñ‚ɏ]‚¤BŠY“–‚·‚é•”•ª‚Æ‚»‚Ì—˜—p‹–‘øŒ_–ñ‚ð‹L‚µ‚½“Y•tƒtƒ@ƒCƒ‹‚ðˆÈ‰º‚ÉŽ¦‚·B -zlib license_zlib.txt -libpng license_libpng.txt -dSFMT license_dSFMT.txt -FFTW license_FFTW.txt +zlib License_zlib.txt +libpng License_libpng.txt +dSFMT License_dSFMT.txt +FFTW License_FFTW.txt +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 --- 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 -version: 1.6.3 -build: 20140401 +version: 1.7.0 +build: 20150401 Psychlops–{‘̂̃Cƒ“ƒXƒg[ƒ‹‚ðŠJŽn‚µ‚Ü‚·B diff --git a/win32gl/test/compilenew.cpp b/win32gl/test/compilenew.cpp index 2f42b04..c1ae204 100644 --- a/win32gl/test/compilenew.cpp +++ b/win32gl/test/compilenew.cpp @@ -5,7 +5,6 @@ // Current Biology, 10, 679-682. ///+ Prefix //// Include Psychlops Package -#define PSYCHLOPS_USE_NIDAQ_MX #include using namespace Psychlops; // Initially developed with Psychlops Win32 1.5.3 / 20110311 ///- Prefix @@ -24,7 +23,6 @@ void psychlops_main() { rect.fill = Color::red; Devices::GenericParallelPort trigger("USB_PARALLEL", 1+8); - Devices::NIDAQmx nidaq(); int t=0; -- 2.11.0