Fix compilation issue

vrunk11 · web-flow · commit 0e94a9193446 · 2022-11-01T11:50:22.000+01:00
Fix some compilation issue on linux
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -103,6 +103,7 @@ target_link_libraries(fl2k_fm libosmo-fl2k_shared
 
 
 if(UNIX)
+target_link_libraries(fl2k_file2 m)
 target_link_libraries(fl2k_test m)
 target_link_libraries(fl2k_fm m)
 endif()
diff --git a/src/fl2k_file.c b/src/fl2k_file.c
@@ -31,13 +31,21 @@
 #include <unistd.h>
 
 #ifndef _WIN32
-#include <unistd.h>
-#define sleep_ms(ms)	usleep(ms*1000)
+	#include <unistd.h>
+	#define sleep_ms(ms)	usleep(ms*1000)
+	#else
+	#include <windows.h>
+	#include <io.h>
+	#include <fcntl.h>
+	#define sleep_ms(ms)	Sleep(ms)
+#endif
+
+#define _FILE_OFFSET_BITS 64
+
+#ifdef _WIN64
+#define FSEEK fseeko64
 #else
-#include <windows.h>
-#include <io.h>
-#include <fcntl.h>
-#define sleep_ms(ms)	Sleep(ms)
+#define FSEEK fseeko
 #endif
 
 #include "osmo-fl2k.h"
@@ -215,7 +223,7 @@ unsigned long calc_nb_skip(long sample_cnt,int linelength,long frame_lengt,long
 	return (nb_skip * linelength);//multiply for giving the number of byte to skip
 }
 
-int *read_sample_file(void *inpt_color)
+int read_sample_file(void *inpt_color)
 {
 	//parametter
 	void *buffer = NULL;
@@ -463,7 +471,7 @@ int *read_sample_file(void *inpt_color)
 			{
 				if(combine_mode == 0)//default
 				{
-					tmp_buf[i] = round((*value16_signed + *value16_2_signed)/ 256.0) + 128;//convert to 8 bit
+					tmp_buf[i] = round((value16 + value16_2)/ 256.0);//convert to 8 bit
 				}
 				else//mode 1
 				{
@@ -724,17 +732,22 @@ int main(int argc, char **argv)
 {
 #ifndef _WIN32
 	struct sigaction sigact, sigign;
+#endif
+
+#ifdef _WIN32 || _WIN64
 	_setmode(_fileno(stdout), O_BINARY);
 	_setmode(_fileno(stdin), O_BINARY);	
 #endif
+
 	int r, opt, i;
 	uint32_t buf_num = 0;
 	int dev_index = 0;
 	void *status;
-	off64_t start_r = 0;
-	off64_t start_g = 0;
-	off64_t start_b = 0;
-	off64_t start_audio = 0;
+
+	uint64_t start_r = 0;
+	uint64_t start_g = 0;
+	uint64_t start_b = 0;
+	uint64_t start_audio = 0;
 
 	//file adress
 	char *filename_r = NULL;
@@ -991,7 +1004,7 @@ if(red == 1)
 		}
 		else
 		{
-			fseeko64(file_r,start_r,0);
+			FSEEK(file_r,start_r,0);
 		}
 	}
 
@@ -1017,7 +1030,7 @@ if(red2 == 1)
 		}
 		else
 		{
-			fseeko64(file2_r,start_r,0);
+			FSEEK(file2_r,start_r,0);
 		}
 	}
 }
@@ -1038,7 +1051,7 @@ if(green == 1)
 		}
 		else
 		{
-			fseeko64(file_g,start_g,0);
+			FSEEK(file_g,start_g,0);
 		}
 	}
 
@@ -1064,7 +1077,7 @@ if(green2 == 1)
 		}
 		else
 		{
-			fseeko64(file2_g,start_g,0);
+			FSEEK(file2_g,start_g,0);
 		}
 	}
 }
@@ -1085,7 +1098,7 @@ if(blue == 1)
 		}
 		else
 		{
-			fseeko64(file_b,start_b,0);
+			FSEEK(file_b,start_b,0);
 		}
 	}
 
@@ -1111,7 +1124,7 @@ if(blue2 == 1)
 		}
 		else
 		{
-			fseeko64(file2_b,start_b,0);
+			FSEEK(file2_b,start_b,0);
 		}
 	}
 }
@@ -1131,7 +1144,7 @@ if(audio == 1)
 		}
 		else
 		{
-			fseeko64(file_audio,start_audio,0);
+			FSEEK(file_audio,start_audio,0);
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -31,13 +31,21 @@`
`31`	`31`	`#include <unistd.h>`
`32`	`32`
`33`	`33`	`#ifndef _WIN32`
`34`		`-#include <unistd.h>`
`35`		`-#define sleep_ms(ms) usleep(ms*1000)`
	`34`	`+ #include <unistd.h>`
	`35`	`+ #define sleep_ms(ms) usleep(ms*1000)`
	`36`	`+ #else`
	`37`	`+ #include <windows.h>`
	`38`	`+ #include <io.h>`
	`39`	`+ #include <fcntl.h>`
	`40`	`+ #define sleep_ms(ms) Sleep(ms)`
	`41`	`+#endif`
	`42`	`+`
	`43`	`+#define _FILE_OFFSET_BITS 64`
	`44`	`+`
	`45`	`+#ifdef _WIN64`
	`46`	`+#define FSEEK fseeko64`
`36`	`47`	`#else`
`37`		`-#include <windows.h>`
`38`		`-#include <io.h>`
`39`		`-#include <fcntl.h>`
`40`		`-#define sleep_ms(ms) Sleep(ms)`
	`48`	`+#define FSEEK fseeko`
`41`	`49`	`#endif`
`42`	`50`
`43`	`51`	`#include "osmo-fl2k.h"`
`@@ -215,7 +223,7 @@ unsigned long calc_nb_skip(long sample_cnt,int linelength,long frame_lengt,long`
`215`	`223`	`return (nb_skip * linelength);//multiply for giving the number of byte to skip`
`216`	`224`	`}`
`217`	`225`
`218`		`-int read_sample_file(void inpt_color)`
	`226`	`+int read_sample_file(void *inpt_color)`
`219`	`227`	`{`
`220`	`228`	`//parametter`
`221`	`229`	`void *buffer = NULL;`
`@@ -463,7 +471,7 @@ int read_sample_file(void inpt_color)`
`463`	`471`	`{`
`464`	`472`	`if(combine_mode == 0)//default`
`465`	`473`	`{`
`466`		`- tmp_buf[i] = round((value16_signed + value16_2_signed)/ 256.0) + 128;//convert to 8 bit`
	`474`	`+ tmp_buf[i] = round((value16 + value16_2)/ 256.0);//convert to 8 bit`
`467`	`475`	`}`
`468`	`476`	`else//mode 1`
`469`	`477`	`{`
`@@ -724,17 +732,22 @@ int main(int argc, char **argv)`
`724`	`732`	`{`
`725`	`733`	`#ifndef _WIN32`
`726`	`734`	`struct sigaction sigact, sigign;`
	`735`	`+#endif`
	`736`	`+`
	`737`	`+#ifdef _WIN32 \|\| _WIN64`
`727`	`738`	`_setmode(_fileno(stdout), O_BINARY);`
`728`	`739`	`_setmode(_fileno(stdin), O_BINARY);`
`729`	`740`	`#endif`
	`741`	`+`
`730`	`742`	`int r, opt, i;`
`731`	`743`	`uint32_t buf_num = 0;`
`732`	`744`	`int dev_index = 0;`
`733`	`745`	`void *status;`
`734`		`- off64_t start_r = 0;`
`735`		`- off64_t start_g = 0;`
`736`		`- off64_t start_b = 0;`
`737`		`- off64_t start_audio = 0;`
	`746`	`+`
	`747`	`+ uint64_t start_r = 0;`
	`748`	`+ uint64_t start_g = 0;`
	`749`	`+ uint64_t start_b = 0;`
	`750`	`+ uint64_t start_audio = 0;`
`738`	`751`
`739`	`752`	`//file adress`
`740`	`753`	`char *filename_r = NULL;`
`@@ -991,7 +1004,7 @@ if(red == 1)`
`991`	`1004`	`}`
`992`	`1005`	`else`
`993`	`1006`	`{`
`994`		`- fseeko64(file_r,start_r,0);`
	`1007`	`+ FSEEK(file_r,start_r,0);`
`995`	`1008`	`}`
`996`	`1009`	`}`
`997`	`1010`
`@@ -1017,7 +1030,7 @@ if(red2 == 1)`
`1017`	`1030`	`}`
`1018`	`1031`	`else`
`1019`	`1032`	`{`
`1020`		`- fseeko64(file2_r,start_r,0);`
	`1033`	`+ FSEEK(file2_r,start_r,0);`
`1021`	`1034`	`}`
`1022`	`1035`	`}`
`1023`	`1036`	`}`
`@@ -1038,7 +1051,7 @@ if(green == 1)`
`1038`	`1051`	`}`
`1039`	`1052`	`else`
`1040`	`1053`	`{`
`1041`		`- fseeko64(file_g,start_g,0);`
	`1054`	`+ FSEEK(file_g,start_g,0);`
`1042`	`1055`	`}`
`1043`	`1056`	`}`
`1044`	`1057`
`@@ -1064,7 +1077,7 @@ if(green2 == 1)`
`1064`	`1077`	`}`
`1065`	`1078`	`else`
`1066`	`1079`	`{`
`1067`		`- fseeko64(file2_g,start_g,0);`
	`1080`	`+ FSEEK(file2_g,start_g,0);`
`1068`	`1081`	`}`
`1069`	`1082`	`}`
`1070`	`1083`	`}`
`@@ -1085,7 +1098,7 @@ if(blue == 1)`
`1085`	`1098`	`}`
`1086`	`1099`	`else`
`1087`	`1100`	`{`
`1088`		`- fseeko64(file_b,start_b,0);`
	`1101`	`+ FSEEK(file_b,start_b,0);`
`1089`	`1102`	`}`
`1090`	`1103`	`}`
`1091`	`1104`
`@@ -1111,7 +1124,7 @@ if(blue2 == 1)`
`1111`	`1124`	`}`
`1112`	`1125`	`else`
`1113`	`1126`	`{`
`1114`		`- fseeko64(file2_b,start_b,0);`
	`1127`	`+ FSEEK(file2_b,start_b,0);`
`1115`	`1128`	`}`
`1116`	`1129`	`}`
`1117`	`1130`	`}`
`@@ -1131,7 +1144,7 @@ if(audio == 1)`
`1131`	`1144`	`}`
`1132`	`1145`	`else`
`1133`	`1146`	`{`
`1134`		`- fseeko64(file_audio,start_audio,0);`
	`1147`	`+ FSEEK(file_audio,start_audio,0);`
`1135`	`1148`	`}`
`1136`	`1149`	`}`
`1137`	`1150`	`}`