steffen
/
MiniWebCam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed float images in convert

Browse Source
main^2
Steffen Pohle 2 months ago
parent 906428b4e0
commit e67d6f8d50
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File

12
convert.cc
Unescape View File

@ -153,7 +153,7 @@ int Convert (ConvertData *cdata, VideoFrame *dest, VideoFrameFloat *destf, unsig
*(ptrdst++) = g; *(ptrdst++) = g;
*(ptrdst++) = b; *(ptrdst++) = b;
} }
else { if (ptrdstf) {
*(ptrdstf++) = (float)r/255.0; *(ptrdstf++) = (float)r/255.0;
*(ptrdstf++) = (float)g/255.0; *(ptrdstf++) = (float)g/255.0;
*(ptrdstf++) = (float)b/255.0; *(ptrdstf++) = (float)b/255.0;
@ -188,7 +188,7 @@ int Convert (ConvertData *cdata, VideoFrame *dest, VideoFrameFloat *destf, unsig
*(ptrdst++) = g; *(ptrdst++) = g;
*(ptrdst++) = b; *(ptrdst++) = b;
} }
else { if (ptrdstf) {
*(ptrdstf++) = (float)r/255.0; *(ptrdstf++) = (float)r/255.0;
*(ptrdstf++) = (float)g/255.0; *(ptrdstf++) = (float)g/255.0;
*(ptrdstf++) = (float)b/255.0; *(ptrdstf++) = (float)b/255.0;
@ -221,7 +221,7 @@ int Convert (ConvertData *cdata, VideoFrame *dest, VideoFrameFloat *destf, unsig
*(ptrdst++) = g; *(ptrdst++) = g;
*(ptrdst++) = b; *(ptrdst++) = b;
} }
else { if (ptrdstf) {
*(ptrdstf++) = (float)r/255.0; *(ptrdstf++) = (float)r/255.0;
*(ptrdstf++) = (float)g/255.0; *(ptrdstf++) = (float)g/255.0;
*(ptrdstf++) = (float)b/255.0; *(ptrdstf++) = (float)b/255.0;
@ -255,7 +255,7 @@ int Convert (ConvertData *cdata, VideoFrame *dest, VideoFrameFloat *destf, unsig
*(ptrdst++) = g; *(ptrdst++) = g;
*(ptrdst++) = b; *(ptrdst++) = b;
} }
else { if (ptrdstf) {
*(ptrdstf++) = (float)r/255.0; *(ptrdstf++) = (float)r/255.0;
*(ptrdstf++) = (float)g/255.0; *(ptrdstf++) = (float)g/255.0;
*(ptrdstf++) = (float)b/255.0; *(ptrdstf++) = (float)b/255.0;
@ -322,7 +322,7 @@ int Convert (ConvertData *cdata, VideoFrame *dest, VideoFrameFloat *destf, unsig
*(ptrdst++) = g; *(ptrdst++) = g;
*(ptrdst++) = b; *(ptrdst++) = b;
} }
else { if (ptrdstf) {
*(ptrdstf++) = (float)r/255.0; *(ptrdstf++) = (float)r/255.0;
*(ptrdstf++) = (float)g/255.0; *(ptrdstf++) = (float)g/255.0;
*(ptrdstf++) = (float)b/255.0; *(ptrdstf++) = (float)b/255.0;
@ -365,7 +365,7 @@ int Convert (ConvertData *cdata, VideoFrame *dest, VideoFrameFloat *destf, unsig
*(ptrdst++) = g; *(ptrdst++) = g;
*(ptrdst++) = b; *(ptrdst++) = b;
} }
else { if (ptrdstf) {
*(ptrdstf++) = (float)r/255.0; *(ptrdstf++) = (float)r/255.0;
*(ptrdstf++) = (float)g/255.0; *(ptrdstf++) = (float)g/255.0;
*(ptrdstf++) = (float)b/255.0; *(ptrdstf++) = (float)b/255.0;

1
webserver.cc
Unescape View File

@ -116,7 +116,6 @@ std::string API_Set_Ctrl(std::string request) {
while ((t = strchr (t, '/'))) { while ((t = strchr (t, '/'))) {
i++; i++;
t++; t++;
printf ("%d %s\n", i, t);
if (i == 3) { if (i == 3) {
char *v = strchr (t, '='); char *v = strchr (t, '=');
id = atol (t); id = atol (t);

6
www/index.html
Unescape View File

@ -92,9 +92,11 @@ function refreshVariables() {
variables = JSON.parse(response); variables = JSON.parse(response);
let table = document.getElementById("variables"); let table = document.getElementById("variables");
let t = "<tbody>"; let t = "<thead><tr><th>Name</th><th>Value</th><th>Description</th></thead><tbody>";
variables.variables.forEach(function (elm, idx) { variables.variables.forEach(function (elm, idx) {
t += "<tr><td>"+elm.name+"</td><td><input class=\"variablevalue\" dataid=\""+elm.name+"\" value=\""+elm.value+"\" size=\"6\"></td></tr>"; t += "<tr><td>"+elm.name+"</td>"+
"<td><input class=\"variablevalue\" dataid=\""+elm.name+"\" value=\""+elm.value+"\" size=\"6\"></td>"+
"<td>"+elm.desc+"</td></tr>";
}); });
t += "</tbody>"; t += "</tbody>";
table.innerHTML = t; table.innerHTML = t;

Write Preview
Loading…
Cancel
Save