From e77ebcd1edec379c18fefacdf9d91d140950f0a8 Mon Sep 17 00:00:00 2001 From: hskwk Date: Fri, 3 Apr 2015 22:23:15 +0900 Subject: [PATCH] 2.0.0 --- .../OpenCV/psychlops_g_OPENCV_bridge_dummy.cpp | 36 ++++++++++++ .../standard/cv/psychlops_cv1_bridge_dummy.cpp | 15 +++++ .../standard/cv/psychlops_cv2_bridge_dummy.cpp | 68 ++++++++++++++++++++++ .../platform/cv/psychlops_misc_opencv_dummy.cpp | 21 +++++++ win32gl/dev/psychlopswin32.cbp | 49 ++++++++++++++-- .../trunk/@EasyInstaller/psychlopswin32_CB10.pj2 | 4 +- .../templates/wizard/PsychlopsGL/wizard.script | 40 ------------- .../templates/wizard/PsychlopsGL/wizard.script | 30 +++++----- .../templates/wizard/PsychlopsGL/wizard.script | 18 +++--- .../templates/wizard/PsychlopsGL/wizard.script | 31 +++++----- .../templates/wizard/PsychlopsGL/wizard.script | 18 +++--- .../templates/wizard/PsychlopsGL/wizard.script | 40 ------------- .../Frameworks/Psychlops.framework/Readme.txt | 2 +- win32gl/package/trunk/copyfiles.bat | 4 +- win32gl/test/Psychlops_win32cblibtest.cbp | 2 +- win32gl/test/compilenew.cpp | 1 + 16 files changed, 237 insertions(+), 142 deletions(-) create mode 100644 psychlops/extension/FileFormat/OpenCV/psychlops_g_OPENCV_bridge_dummy.cpp create mode 100644 psychlops/extension/standard/cv/psychlops_cv1_bridge_dummy.cpp create mode 100644 psychlops/extension/standard/cv/psychlops_cv2_bridge_dummy.cpp create mode 100644 psychlops/platform/cv/psychlops_misc_opencv_dummy.cpp diff --git a/psychlops/extension/FileFormat/OpenCV/psychlops_g_OPENCV_bridge_dummy.cpp b/psychlops/extension/FileFormat/OpenCV/psychlops_g_OPENCV_bridge_dummy.cpp new file mode 100644 index 0000000..1d1720e --- /dev/null +++ b/psychlops/extension/FileFormat/OpenCV/psychlops_g_OPENCV_bridge_dummy.cpp @@ -0,0 +1,36 @@ +/* + * psychlops_g_PNG_bridge.cpp + * Psychlops Standard Library (Universal) + * + * Last Modified 2006/08/22 by Kenchi HOSOKAWA + * (C) 2006- Kenchi HOSOKAWA, Kazushi MARUYA and Takao SATO + */ + +#include +#include + +#include "../../../core/ApplicationInterfaces/psychlops_code_exception.h" +#include "../../../core/graphic/psychlops_g_image.h" +#include "psychlops_g_OPENCV_bridge.h" + + +namespace Psychlops { +namespace IMAGE_FORMATS { + + + OPENCV_BRIDGE::OPENCV_BRIDGE() { + } + OPENCV_BRIDGE::~OPENCV_BRIDGE() { + } + + + void OPENCV_BRIDGE::load(const char *file_name, Image * target) { + std::cout << "The compiler did not support OpenCV2." << std::endl; + } + void OPENCV_BRIDGE::save(const char *file_name, Image * target) { + std::cout << "The compiler did not support OpenCV2." << std::endl; + } + + +} +} diff --git a/psychlops/extension/standard/cv/psychlops_cv1_bridge_dummy.cpp b/psychlops/extension/standard/cv/psychlops_cv1_bridge_dummy.cpp new file mode 100644 index 0000000..c4b0097 --- /dev/null +++ b/psychlops/extension/standard/cv/psychlops_cv1_bridge_dummy.cpp @@ -0,0 +1,15 @@ +/* + * psychlops_FFTW_bridge.cpp + * Psychlops Standard Library (Universal) + * + * Last Modified 2010/03/05 by Kenchi HOSOKAWA + * (C) 2010 Kenchi HOSOKAWA, Kazushi MARUYA, Takao SATO + */ + + +#include "../../../psychlops_core.h" +#include "psychlops_cv1_bridge.h" + + +namespace Psychlops { +} /* <- namespace Psycholops */ diff --git a/psychlops/extension/standard/cv/psychlops_cv2_bridge_dummy.cpp b/psychlops/extension/standard/cv/psychlops_cv2_bridge_dummy.cpp new file mode 100644 index 0000000..1d86caa --- /dev/null +++ b/psychlops/extension/standard/cv/psychlops_cv2_bridge_dummy.cpp @@ -0,0 +1,68 @@ +/* + * psychlops_FFTW_bridge.cpp + * Psychlops Standard Library (Universal) + * + * Last Modified 2010/03/05 by Kenchi HOSOKAWA + * (C) 2010 Kenchi HOSOKAWA, Kazushi MARUYA, Takao SATO + */ + + +#include "../../../psychlops_core.h" +#include "psychlops_cv2_bridge.h" + + +//AppState::ImageByteAlignment = 4; + +namespace Psychlops { + +void Matrix::from(const cv::Mat &target) +{ + std::cout << "The compiler did not support OpenCV2." << std::endl; +} +void Matrix::convertFromCvMat(Matrix &gray, const cv::Mat &target) +{ + std::cout << "The compiler did not support OpenCV2." << std::endl; +} +void Matrix::convertFromCvMat(Matrix &r, Matrix &g, Matrix &b, const cv::Mat &target) +{ + std::cout << "The compiler did not support OpenCV2." << std::endl; +} +void Matrix::convertFromCvMat(Matrix &r, Matrix &g, Matrix &b, Matrix &a, const cv::Mat &target) +{ + std::cout << "The compiler did not support OpenCV2." << std::endl; +} + +void Matrix::to(cv::Mat &target) const +{ + std::cout << "The compiler did not support OpenCV2." << std::endl; +} + +void Matrix::convertToCvMat(const Matrix &gray, cv::Mat &target) +{ + std::cout << "The compiler did not support OpenCV2." << std::endl; +} + +void Matrix::convertToCvMat(const Matrix &r, const Matrix &g, const Matrix &b, cv::Mat &target) +{ + std::cout << "The compiler did not support OpenCV2." << std::endl; +} + +void Matrix::convertToCvMat(const Matrix &r, const Matrix &g, const Matrix &b, const Matrix &a, cv::Mat &target) +{ + std::cout << "The compiler did not support OpenCV2." << std::endl; +} + + +void Image::to(cv::Mat &target) const +{ + std::cout << "The compiler did not support OpenCV2." << std::endl; +} + + +void Image::from(cv::Mat &source) +{ + std::cout << "The compiler did not support OpenCV2." << std::endl; +} + + +} /* <- namespace Psycholops */ diff --git a/psychlops/platform/cv/psychlops_misc_opencv_dummy.cpp b/psychlops/platform/cv/psychlops_misc_opencv_dummy.cpp new file mode 100644 index 0000000..0af47c1 --- /dev/null +++ b/psychlops/platform/cv/psychlops_misc_opencv_dummy.cpp @@ -0,0 +1,21 @@ +/* + * psychlops_widgets_Win32GL.cpp + * Psychlops Standard Library (Universal) + * + * Last Modified 2009/12/14 by Kenchi HOSOKAWA + * (C) 2009 Kenchi HOSOKAWA, Kazushi MARUYA and Takao SATO + */ + + +#include "../../extension/standard/figure/psychlops_figure_standard.h" + + +namespace Psychlops { + + Figures::Movie& Figures::Movie::save(std::string filename, const double t_fps, const FOURCC codec) { + std::cout << "The compiler did not support OpenCV2." << std::endl; + return *this; + } + + +} /* <- namespace Psycholops */ diff --git a/win32gl/dev/psychlopswin32.cbp b/win32gl/dev/psychlopswin32.cbp index 90ac7b7..b690a3e 100644 --- a/win32gl/dev/psychlopswin32.cbp +++ b/win32gl/dev/psychlopswin32.cbp @@ -62,7 +62,7 @@ -