search

tsdconseil / opencv-demonstrator

OpenCV demonstrator (GUI)
http://www.tsdconseil.fr/log/opencv/demo/index-en.html
GNU Lesser General Public License v3.0
141 stars 57 forks source link

Converting files to UTF-8 character encoding. #16

Closed valera-rozuvan closed 8 years ago

valera-rozuvan commented 8 years ago

@juliena82 Please check this Pull Request. See the list of files that I converted to UTF-8. If all is OK, please Merge this Pull Request. Thanks = )

valera-rozuvan commented 8 years ago

@juliena82 We can't merge this PR yet!

I get a build error:

./build/debug/lib.a(demos-registration.o): In function `OCVDemo::add_demos()':
/home/valera/github_projects/tsdconseil/opencv-demonstrator/ocvdemo/./src/demos-registration.cc:42: undefined reference to `ContourDemo::ContourDemo()'
/home/valera/github_projects/tsdconseil/opencv-demonstrator/ocvdemo/./src/demos-registration.cc:52: undefined reference to `CannyDemo::CannyDemo()'
/home/valera/github_projects/tsdconseil/opencv-demonstrator/ocvdemo/./src/demos-registration.cc:53: undefined reference to `HoughDemo::HoughDemo()'
/home/valera/github_projects/tsdconseil/opencv-demonstrator/ocvdemo/./src/demos-registration.cc:54: undefined reference to `HoughCDemo::HoughCDemo()'
/home/valera/github_projects/tsdconseil/opencv-demonstrator/ocvdemo/./src/demos-registration.cc:55: undefined reference to `GradientDemo::GradientDemo()'
/home/valera/github_projects/tsdconseil/opencv-demonstrator/ocvdemo/./src/demos-registration.cc:56: undefined reference to `LaplaceDemo::LaplaceDemo()'
/home/valera/github_projects/tsdconseil/opencv-demonstrator/ocvdemo/./src/demos-registration.cc:57: undefined reference to `NetDemo::NetDemo()'
/home/valera/github_projects/tsdconseil/opencv-demonstrator/ocvdemo/./src/demos-registration.cc:66: undefined reference to `RectDemo::RectDemo()'
collect2: error: ld returned 1 exit status
../libcutil/data/std-makefile-defs:209: recipe for target 'build/debug/ocvdemo.exe' failed
make[1]: *** [build/debug/ocvdemo.exe] Error 1
rm build/debug/ocvdemo.o
make[1]: Leaving directory '/home/valera/github_projects/tsdconseil/opencv-demonstrator/ocvdemo'
Makefile:33: recipe for target 'linux' failed
make: *** [linux] Error 2
valera-rozuvan commented 8 years ago

It seems that I have accidentally removed the files:

I will fix this, and update. Please wait = )

juliena82 commented 8 years ago

Here, no build error. But I didn't checked the master branch.

valera-rozuvan commented 8 years ago

@juliena82 This Pull Request is referencing the branch valera/convert_to_utf8. It is separate from master branch.

juliena82 commented 8 years ago

@valera-rozuvan Ok, you can do the merge. But before, check that all still works (including execution), and also that you didn't modified the files in libcutil/data.

valera-rozuvan commented 8 years ago

@juliena82 What's the character encoding of the file ocvdemo/src/demo-items/gradient-demo.cc ? It reports to me that it is unknown-8bit.