16mm
/
filmout_display
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: 16mm:78cca62c12aff45a590a9915d9385a239d4b6aed
Branches Tags
16mm:main
...
compare: 16mm:a2b69433e2213ae19f9f908522682cd6657e1696
Branches Tags
16mm:main

2 Commits
78cca62c12 ... a2b69433e2

Author SHA1 Message Date
mmcwilliams a2b69433e2 Resize the image before placing within the blank image. 2024-04-27 11:56:34 -06:00
mmcwilliams cc045fe775 Optionally set the port with an argument. 2024-04-27 11:55:33 -06:00
2 changed files with 12 additions and 10 deletions
Show Stats Expand all files Collapse all files

12
src/image.cpp
View File

@ -13,14 +13,14 @@ Mat Image::loadImage (string& image_path, uint64_t& x, uint64_t& y, uint64_t& w,
Mat loaded = imread(located_path, IMREAD_COLOR);
Mat image = getBlank();
if (image.empty()) {
cerr << "Image " << image << " empty" << endl;
if (loaded.empty()) {
cerr << "Image " << loaded << " empty" << endl;
} else {
cout << "loaded " << image_path << endl;
cout << " dim " << loaded.cols << "x" << loaded.rows << endl;
cout << "Loaded image " << image_path << endl;
//cout << " dim " << loaded.cols << "x" << loaded.rows << endl;
//resize(loaded, resized, Size(1280, 1080));
cout << " image " << image.cols << "x" << image.rows << endl;
resize(loaded, loaded, Size(h, w));
//cout << " image " << image.cols << "x" << image.rows << endl;
//cout << "resized " << resized.cols << "x" << resized.rows << endl;
//resized.copyTo(image(Rect(0, 0, resized.cols, resized.rows)));
loaded.copyTo(image(Rect(x, y, loaded.cols, loaded.rows)));

10
src/main.cpp
View File

@ -22,7 +22,7 @@
using namespace std;
const uint16_t PORT = 8081;
uint16_t PORT = 8081;
const uint16_t BUFFER_SIZE = 2048;
GLuint imageTexture = 0;
@ -68,7 +68,6 @@ void actionStop () {
void loadBlank () {
Mat blank = img.getBlank();
glGenTextures(1, &blankTexture);
glBindTexture(GL_TEXTURE_2D, blankTexture);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
@ -237,7 +236,10 @@ uint8_t handleArgs (int argc, char** argv) {
cerr << "Please provide screen height as second argument" << endl;
return 2;
}
cout << screenWidth << "x" << screenHeight << endl;
if (argc > 3) {
PORT = (uint16_t) atoi(argv[3]);
cout << "Set port: " << PORT << endl;
}
return 0;
}
@ -252,7 +254,7 @@ int main (int argc, char** argv) {
glutInit(&argc, argv);
glutInitDisplayMode(GLUT_SINGLE);
glutCreateWindow("opengl_opencv_example");
glutCreateWindow("filmout_display");
glutSetCursor(GLUT_CURSOR_NONE);
glutFullScreen();
glutDisplayFunc(display);