tTh/FloatImg
2
2
Fork 1
Code Issues 2 Pull Requests Releases Wiki Activity

Compare commits

base: tTh:3e0a2eb9d9d83a8ee872dd55dd2587626f29970a
Branches Tags
tTh:master
..
compare: tTh:b23ebec4a519b0226337361ed44cd6ac006115f7
Branches Tags
tTh:master

No commits in common. "3e0a2eb9d9d83a8ee872dd55dd2587626f29970a" and "b23ebec4a519b0226337361ed44cd6ac006115f7" have entirely different histories.
3e0a2eb9d9 ... b23ebec4a5

3 changed files with 2 additions and 30 deletions
Show Stats Expand all files Collapse all files

3
lib/fimg-file.c
View File

@ -74,7 +74,6 @@ if (NULL==fp) {
return -1; return -1;
} }
memset(&filehead, 0, sizeof(filehead));
strcpy(filehead.magic, "FIMG"); strcpy(filehead.magic, "FIMG");
filehead.w = fimg->width; filehead.h = fimg->height; filehead.w = fimg->width; filehead.h = fimg->height;
filehead.t = fimg->type; filehead.t = fimg->type;
@ -139,6 +138,6 @@ if (foo) {
foo = fread(head->R, sizeof(float), filehead.w*filehead.h*3, fp); foo = fread(head->R, sizeof(float), filehead.w*filehead.h*3, fp);
fclose(fp); fclose(fp);
return 0; return 0;
} }

27
v4l2/v4l2_pr_structs.c
View File

@ -195,27 +195,6 @@ if (ptr->capabilities) {
return -1; return -1;
} }
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
char * str_colorspace(int colspace)
{
switch(colspace) {
case V4L2_COLORSPACE_DEFAULT: return "default";
case V4L2_COLORSPACE_SMPTE170M: return "smpte170m";
case V4L2_COLORSPACE_SMPTE240M: return "smpte240m";
case V4L2_COLORSPACE_REC709: return "rec709";
case V4L2_COLORSPACE_BT878: return "bt878";
case V4L2_COLORSPACE_470_SYSTEM_M: return "470-sys-M";
case V4L2_COLORSPACE_470_SYSTEM_BG: return "470-sys-BG";
case V4L2_COLORSPACE_JPEG: return "jpeg";
case V4L2_COLORSPACE_SRGB: return "srgb";
case V4L2_COLORSPACE_ADOBERGB: return "adobergb";
case V4L2_COLORSPACE_BT2020: return "bt2020";
case V4L2_COLORSPACE_RAW: return "raw";
case V4L2_COLORSPACE_DCI_P3: return "dci-p3";
}
return "???";
}
/* --------------------------------------------------------------------- */
int pr_v4l2_format(char *txt, struct v4l2_format *ptr) int pr_v4l2_format(char *txt, struct v4l2_format *ptr)
{ {
fprintf(FP, "-- v4l2_format, %-15s %p\n", txt, ptr); fprintf(FP, "-- v4l2_format, %-15s %p\n", txt, ptr);
@ -234,11 +213,7 @@ switch(ptr->type) {
ptr->fmt.pix.field); /* enum v4l2_field */ ptr->fmt.pix.field); /* enum v4l2_field */
fprintf(FP, " padding %d\n", fprintf(FP, " padding %d\n",
ptr->fmt.pix.bytesperline); ptr->fmt.pix.bytesperline);
fprintf(FP, " sizeimage %d\n",
ptr->fmt.pix.sizeimage);
fprintf(FP, " colorspace %d %s\n",
ptr->fmt.pix.colorspace,
str_colorspace(ptr->fmt.pix.colorspace));
break; break;
default: fprintf(FP, "XXX type %d unknow\n", ptr->type); default: fprintf(FP, "XXX type %d unknow\n", ptr->type);

2
v4l2/video-infos.c
View File

@ -123,9 +123,7 @@ for (idx=V4L2_CID_BASE; idx<V4L2_CID_LASTP1; idx++) {
} }
else if (EINVAL==errno) { else if (EINVAL==errno) {
#if DEBUG_LEVEL
if (verbosity) fprintf(stderr, "id %d einval\n", idx); if (verbosity) fprintf(stderr, "id %d einval\n", idx);
#endif
continue; continue;
} }
else { else {