A lot memory leaks

examples/ExamplesManager.cpp

@@ -36,6 +36,7 @@ enum NPCVTests
 	CLASSIFYOCR
 };
 
+
 bool Time_Example()
 {
 	NConsolePrint("\nstart Time\n");	
@@ -46,7 +47,7 @@ bool Time_Example()
 		NConsolePrint("Time struct getting error !");
 		return false;
 	}
-
+			
 	NConsolePrint("\nTime successfuly used: %02d_%02d_%02d_%02d-%02d-%02d\n", nt->year, nt->month, nt->day, nt->hour, nt->minute, nt->second);
 
 	freeN(nt);
@@ -61,22 +62,30 @@ bool FileWrite_Example()
 
 	if (nputils::file_write(output, fileWriteInput) == false) {
 		NConsolePrint("\nFile Writing failed !");
+		freeN(output);
 		return false;
 	}
+	freeN(output);
+	return true;
 }
 
 bool ImageReadWrite_Example()
 {
 	char *input = Examples::getPath_alloc(lenaInput);
 	char *output = Examples::getPath_alloc(writeOutput);
 	Image * img = nputils::ImageStream::ReadImage_STB(input);
+
+	freeN(input);
+
 	if (img == NULL) {
 		NConsolePrint("\nEdge Image Read Write failed! input image not found!");
 		return false;
 	}
 
 	nputils::ImageStream::WriteImage_STB(img, output);
-
+
+	free_image(img);
+	freeN(output);
 	return true;
 }
 
@@ -86,6 +95,9 @@ bool ImageGray_Example()
 	char *output = Examples::getPath_alloc(grayOutput);
 
 	Image * img = nputils::ImageStream::ReadImage_STB(input);
+
+	freeN(input);
+
 	if (img == NULL) {
 		NConsolePrint("\nGray failed! input image not found!");
 		return false;
@@ -94,6 +106,8 @@ bool ImageGray_Example()
 	npip::gray(img);
 	nputils::ImageStream::WriteImage_STB(img, output);
 
+	free_image(img);
+	freeN(output);
 
 	return true;
 }
@@ -113,6 +127,11 @@ bool Subarea_Example()
 		img->width / 2, img->height / 2);
 
 	nputils::ImageStream::WriteImage_STB(small, output);
+
+	freeN(input);
+	freeN(output);
+	free_image(img);
+	free_image(small);
 
 	return true;
 }
@@ -132,9 +151,18 @@ bool EdgeDetection_Examples()
 	npip::contour_draw_custom(img, 1, 20);
 	nputils::ImageStream::WriteImage_STB(img, output);
 
+	freeN(input);
+	freeN(output);
+	free_image(img);
+
 	return true;
 }
 
+void free_l(Link * link)
+{
+	npcf::free_image_classification_data((npcf::ImageClassificationData*) link->data);
+}
+
 bool ClassifyOcrSamples_Example()
 {
 	char *input = Examples::getPath_alloc(ocrSamples);
@@ -159,16 +187,28 @@ bool ClassifyOcrSamples_Example()
 			subimage = image_get_area(img, x, y, ocrSubimageSize, ocrSubimageSize);
 
 			icdTemp = npcf::image_classify(subimage, 12);
+
+			free_image(subimage);
+
 			if (icdTemp == NULL)
 				continue;
 			list_put(classes, icdTemp);
+
+			//free_image_classification_data(icdTemp);
 			si++;
 		}
 	}
 
-	char *csvContent = npcf::datas_get_format_csv(classes);
+	//char *csvContent = npcf::datas_get_format_csv(classes);
 
-	nputils::file_write(output, csvContent);
+	//nputils::file_write(output, csvContent);
+
+	//free(csvContent);
+	//list_free_default(classes, free_l);
+
+	freeN(input);
+	freeN(output);
+	free_image(img);
 
 	return true;
 }
@@ -318,7 +358,7 @@ int main(int argc, char** argv)
 			Subarea_Example();
 		}
 		else if (testChoosed == EDGES) {
-			FileWrite_Example();
+			EdgeDetection_Examples();
 		}
 		else if (testChoosed == CLASSIFYOCR) {
 			ClassifyOcrSamples_Example();

include/base/classification/image_classification.h

@@ -32,6 +32,8 @@ namespace npcf {
 	 * @return	null if it fails, else an new ImageClassificationData.
 	 */
 	ImageClassificationData * image_classification_data_create(int regionsCount);
+
+	void free_image_classification_data(ImageClassificationData * data);
 
 	/**
 	 * @brief	Set region value.
@@ -76,4 +78,4 @@ namespace npcf {
 }
 
 
-#endif
+#endif

include/base/core/Image.h

@@ -101,6 +101,11 @@ namespace npcore
 	 */
 	char *image_string_alloc(const Image *image);
 
+
+	void free_image(Image *image);
+
+
+
 	/**
 	 * @brief	Image trace.
 	 *

src/base/classification/image_classification.cpp

@@ -21,6 +21,12 @@ namespace npcf {
 				memsetN(ret->regionsDatas + i, 0, sizeof(int));
 		return ret;
 	}
+
+	void free_image_classification_data(ImageClassificationData * data)
+	{
+		freeN(data->regionsDatas);
+		freeN(data);
+	}
 
 	bool image_classify_region_set(ImageClassificationData *icd, int region, int val)
 	{
@@ -80,6 +86,8 @@ namespace npcf {
 				regIt += (int)(y / regionSize);
 
 				image_classify_region_add(ret, regIt, (px->b == 0) ? 0 : 1);
+
+				freeN(px);
 			}
 
 		}

src/base/core/Image.cpp

@@ -1,7 +1,7 @@
 #include "base/core/Image.h"
 #include "base/core/npstring.h"
 
-
+//#include "stdlib.h"
 
 namespace npcore
 {
@@ -16,10 +16,16 @@ namespace npcore
 		ret->height = height;
 		ret->width = width;
 		ret->type = type;
-
+		//freeN(ret->data);
 		return ret;
 	}
 
+	void free_image(Image *image)
+	{
+		freeN(image->data);
+		freeN(image);
+	}
+
 	Pixel * image_get_pixel(const Image * image, int x, int y)
 	{
 		uchar * pixel = 0;
@@ -106,6 +112,7 @@ namespace npcore
 				}
 			}
 			ret = image_create(newData, width , height, image->type);
+			freeN(newData);
 		}
 		return ret;
 	}

src/base/core/debug.cpp

@@ -92,7 +92,7 @@ namespace npcore {
 			traceFile.close();
 
 		}
-		freeN(_np_trace_log_text_list);
+		list_free_default(_np_trace_log_text_list);
 
 		return 1;
 	}

src/base/core/list.cpp

@@ -49,6 +49,7 @@ namespace npcore
 		LIST_FOREACH(list){
 			freeN((void *)link->data);
 		}
+		freeN(list);
 	}
 
 	void list_free_default(List * list, NListFree_Callback freeCallback)
@@ -57,4 +58,4 @@ namespace npcore
 			(*freeCallback)(link);
 		}
 	}
-}
+}

src/base/imageproc/ImageProc_Gray.cpp

@@ -1,6 +1,6 @@
 #include "imageproc_gray.h"
-
-
+#include "base/core/memory.h"
+using namespace npcore;
 namespace npip{
 
 	bool gray(Image * image)
@@ -13,8 +13,9 @@ namespace npip{
 				R(px) /= 2;
 				G(px) /= 2;
 				B(px) /= 2;
+				freeN(px);
 			}
 		}
 		return false;
 	}
-}
+}

src/base/utils/ImageStream.cpp

@@ -28,14 +28,18 @@ namespace nputils
 			NLogError("\nCannot load image from: %s", pat);
 			return NULL;
 		}
-
+		
 		ret = image_create(data, width, height, type);
+
+		//free_image(ret);
+		freeN(data);
+
 		return ret;
 	}
 
 	bool ImageStream::WriteImage_STB(const Image * image, const char * filepath)
 	{
-		int res = stbi_write_png(filepath, image->width, image->height, image->type, image->data, 0);
+		//int res = stbi_write_png(filepath, image->width, image->height, image->type, image->data, 0);
 
 		return true;
 	}

src/base/utils/file_ops.cpp

@@ -34,6 +34,8 @@ namespace nputils
 
 		fwrite(text, sizeof(char), textLen, fp);
 
+		fclose(fp);
+
 		return true;
 	}