KJ135
/
RasterProcessTool
mirror of http://172.16.0.12:5000/LAMPSARToolSoftware/RasterProcessTool.git
4
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

补充头文件的 分号处理

pull/13/head
陈增辉 2025-03-25 14:31:04 +08:00
parent 2df4b86cb1
commit c8d3f62cd5
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
BaseCommonLibrary/BaseTool/BaseConstVariable.h
View File

@ -307,7 +307,7 @@ inline void delArrPtr(void* p)
} }
delete[] p; delete[] p;
p = nullptr; p = nullptr;
} };
inline void delPointer(void* p) inline void delPointer(void* p)
{ {
@ -316,34 +316,34 @@ inline void delPointer(void* p)
} }
delete p; delete p;
p = nullptr; p = nullptr;
} };
inline void PrintTime() { inline void PrintTime() {
time_t current_time; time_t current_time;
time(&current_time); time(&current_time);
printf("Current timestamp in seconds: %ld\n", (long)current_time); printf("Current timestamp in seconds: %ld\n", (long)current_time);
} };
/** 计算分块 ******************************************************************/ /** 计算分块 ******************************************************************/
inline long getBlockRows(long sizeMB, long cols,long sizeMeta,long maxRows) { inline long getBlockRows(long sizeMB, long cols, long sizeMeta, long maxRows) {
long rownum= (round(Memory1MB * 1.0 / sizeMeta / cols * sizeMB) + cols - 1); long rownum = (round(Memory1MB * 1.0 / sizeMeta / cols * sizeMB) + cols - 1);
rownum = rownum < 0 ? 1 : rownum; rownum = rownum < 0 ? 1 : rownum;
rownum =rownum < maxRows ? rownum : maxRows; rownum = rownum < maxRows ? rownum : maxRows;
return rownum; return rownum;
} };
inline long nextpow2(long n) { inline long nextpow2(long n) {
long en = ceil(log2(n)); long en = ceil(log2(n));
return pow(2,en); return pow(2, en);
} };
inline void releaseVoidArray(void* a) inline void releaseVoidArray(void* a)
{ {
free(a); free(a);
a = NULL; a = NULL;
} };

20
BaseCommonLibrary/BaseTool/BaseTool.h
View File

@ -143,28 +143,28 @@ inline double calculate_MuhlemanSigma(double eta_deg) {
const double denominator = sin_eta + 0.1 * cos_eta; const double denominator = sin_eta + 0.1 * cos_eta;
return (0.0133 * cos_eta) / std::pow(denominator, 3); return (0.0133 * cos_eta) / std::pow(denominator, 3);
} };
template<typename T> template<typename T>
inline void memsetInitArray(std::shared_ptr<T> ptr, long arrcount,T ti) { inline void memsetInitArray(std::shared_ptr<T> ptr, long arrcount, T ti) {
for (long i = 0; i < arrcount; i++) { for (long i = 0; i < arrcount; i++) {
ptr.get()[i] = ti; ptr.get()[i] = ti;
} }
} };
template<typename T> template<typename T>
inline void memcpyArray(std::shared_ptr<T> srct, std::shared_ptr<T> dest, long arrcount) { inline void memcpyArray(std::shared_ptr<T> srct, std::shared_ptr<T> dest, long arrcount) {
for (long i = 0; i < arrcount; i++) { for (long i = 0; i < arrcount; i++) {
dest.get()[i] = srct.get()[i]; dest.get()[i] = srct.get()[i];
} }
} };
template<typename T> template<typename T>
inline void minValueInArr(T* ptr, long arrcount, T& minvalue) { inline void minValueInArr(T* ptr, long arrcount, T& minvalue) {
if (arrcount == 0)return; if (arrcount == 0)return;
minvalue = ptr[0]; minvalue = ptr[0];
@ -173,7 +173,7 @@ inline void minValueInArr(T* ptr, long arrcount, T& minvalue) {
minvalue = ptr[i]; minvalue = ptr[i];
} }
} }
} };
template<typename T> template<typename T>
inline void maxValueInArr(T* ptr, long arrcount, T& maxvalue) { inline void maxValueInArr(T* ptr, long arrcount, T& maxvalue) {
@ -186,7 +186,7 @@ inline void maxValueInArr(T* ptr, long arrcount, T& maxvalue) {
maxvalue = ptr[i]; maxvalue = ptr[i];
} }
} }
} };
@ -196,7 +196,7 @@ inline void maxValueInArr(T* ptr, long arrcount, T& maxvalue) {
template<typename T> template<typename T>
inline T complexAbs(std::complex<T> ccdata) { inline T complexAbs(std::complex<T> ccdata) {
return T(sqrt(pow(ccdata.real(), 2) + pow(ccdata.imag(), 2))); return T(sqrt(pow(ccdata.real(), 2) + pow(ccdata.imag(), 2)));
} };
template<typename T> template<typename T>
inline void complex2dB(std::complex<T>* ccdata, T* outdata, long long count) { inline void complex2dB(std::complex<T>* ccdata, T* outdata, long long count) {
@ -205,7 +205,7 @@ inline void complex2dB(std::complex<T>* ccdata, T* outdata, long long count) {
outdata[i] = 20 * log10(complexAbs(ccdata[i])); outdata[i] = 20 * log10(complexAbs(ccdata[i]));
} }
} };

4
BaseCommonLibrary/BaseTool/ImageOperatorBase.h
View File

@ -513,7 +513,7 @@ inline std::shared_ptr<T> readDataArr(gdalImage& imgds, long start_row, long sta
omp_destroy_lock(&lock); // 劫伙拷斤拷 omp_destroy_lock(&lock); // 劫伙拷斤拷
GDALDestroy(); // or, DllMain at DLL_PROCESS_DETACH GDALDestroy(); // or, DllMain at DLL_PROCESS_DETACH
return result; return result;
} };
template<typename T> template<typename T>
inline std::shared_ptr<T> readDataArrComplex(gdalImageComplex& imgds, long start_row, long start_col, long& rows_count, long& cols_count, int band_ids, GDALREADARRCOPYMETHOD method) inline std::shared_ptr<T> readDataArrComplex(gdalImageComplex& imgds, long start_row, long start_col, long& rows_count, long& cols_count, int band_ids, GDALREADARRCOPYMETHOD method)
@ -586,7 +586,7 @@ inline std::shared_ptr<T> readDataArrComplex(gdalImageComplex& imgds, long start
omp_destroy_lock(&lock); // 劫伙拷斤拷 omp_destroy_lock(&lock); // 劫伙拷斤拷
GDALDestroy(); // or, DllMain at DLL_PROCESS_DETACH GDALDestroy(); // or, DllMain at DLL_PROCESS_DETACH
return result; return result;
} };