From 7d05388ca497f5035103cfd3274681d7434cbed2 Mon Sep 17 00:00:00 2001
From: Jens Lody <jens@codeblocks.org>
Date: Wed, 27 Jul 2016 01:00:18 +0200
Subject: Replace file with problematic license with a file in the public
domain
(https://en.wikipedia.org/wiki/File:Arnold_Schwarzenegger_edit%28ws%29.jpg).
Backport of svn revisions 10858, 10859 and 10863.
diff --git a/src/plugins/scriptedwizard/resources/opencv/Makefile.am b/src/plugins/scriptedwizard/resources/opencv/Makefile.am
index 76096d8..6356c1d 100644
--- a/src/plugins/scriptedwizard/resources/opencv/Makefile.am
+++ b/src/plugins/scriptedwizard/resources/opencv/Makefile.am
@@ -9,5 +9,5 @@ dist_pkgdata_DATA = logo.png \
filesdir = $(pkgdatadir)/files
dist_files_DATA = files/main.cpp \
- files/lena.jpg
+ files/arnold_schwarzenegger.jpg
diff --git a/src/plugins/scriptedwizard/resources/opencv/files/main.cpp b/src/plugins/scriptedwizard/resources/opencv/files/main.cpp
index 39e73a3..82fe762 100644
--- a/src/plugins/scriptedwizard/resources/opencv/files/main.cpp
+++ b/src/plugins/scriptedwizard/resources/opencv/files/main.cpp
@@ -5,11 +5,11 @@ using namespace cv;
int main(int argc, char *argv[])
{
- Mat img = imread("lena.jpg", CV_LOAD_IMAGE_COLOR);
+ Mat img = imread("arnold_schwarzenegger.jpg", CV_LOAD_IMAGE_COLOR);
if(img.empty())
return -1;
- namedWindow( "lena", CV_WINDOW_AUTOSIZE );
- imshow("lena", img);
+ namedWindow("arnold_schwarzenegger", CV_WINDOW_AUTOSIZE );
+ imshow("arnold_schwarzenegger", img);
waitKey(0);
return 0;
}