[Phission-cvs] phission/examples/cpp/MLImageNeuralNetwork/src MLImageNeuralNetwork.cpp,1.26,1.27 ima
Brought to you by:
pthoren
Menu
▾
▴
[Phission-cvs] phission/examples/cpp/MLImageNeuralNetwork/src MLImageNeuralNetwork.cpp,1.26,1.27 image_collection.cpp,1.6,1.7
|
From: Philip T. <pt...@us...> - 2005-11-30 23:12:55
|
Update of /cvsroot/phission/phission/examples/cpp/MLImageNeuralNetwork/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29066/src Modified Files: MLImageNeuralNetwork.cpp image_collection.cpp Log Message: Removed the cropping code from image_collection.cpp; it's part of Phission now Index: MLImageNeuralNetwork.cpp =================================================================== RCS file: /cvsroot/phission/phission/examples/cpp/MLImageNeuralNetwork/src/MLImageNeuralNetwork.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** MLImageNeuralNetwork.cpp 30 Nov 2005 20:42:20 -0000 1.26 --- MLImageNeuralNetwork.cpp 30 Nov 2005 23:12:47 -0000 1.27 *************** *** 1983,1986 **** --- 1983,1989 ---- rc = arg_parser.add("--nhidden",&nhidden,phARG_UINT32); phCHECK_RC(rc,NULL,"arg_parser.add"); + rc = arg_parser.add("--alg",&algorithm,phARG_CHAR); + phCHECK_RC(rc,NULL,"arg_parser.add"); + /* variables to disable certain inputs to the ANN */ *************** *** 2003,2009 **** phCHECK_RC(rc,NULL,"arg_parser.add"); - rc = arg_parser.add("--alg",&algorithm,phARG_CHAR); - phCHECK_RC(rc,NULL,"arg_parser.add"); - /* parse the command line */ rc = arg_parser.parse(argc,argv); --- 2006,2009 ---- Index: image_collection.cpp =================================================================== RCS file: /cvsroot/phission/phission/examples/cpp/MLImageNeuralNetwork/src/image_collection.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** image_collection.cpp 27 Nov 2005 16:41:45 -0000 1.6 --- image_collection.cpp 30 Nov 2005 23:12:47 -0000 1.7 *************** *** 474,486 **** phFUNCTION("idc_readfile") ! FILE *fp = NULL; ! char *buffer = NULL; ! int file_finished = 0; ! int i = 0; ! int nfields = 0; ! char *outdir = NULL; ! char *type = NULL; ! int width, height = 0; struct image_data_set_t *setptr = NULL; --- 474,487 ---- phFUNCTION("idc_readfile") ! intmax_t frc = 0; ! FILE *fp = NULL; ! char *buffer = NULL; ! int file_finished = 0; ! uint32_t i = 0; ! int nfields = 0; ! char *outdir = NULL; ! char *type = NULL; ! int width, height = 0; struct image_data_set_t *setptr = NULL; *************** *** 510,516 **** { buffer[0] = '\0'; ! rc = (int)fgets(buffer,254,fp); //phPROGRESS("(%d)buf-%s\n",errno,buffer); ! if (rc != EOF) { while ((buffer[i] != '\0') && (buffer[i] != '#')) i++; --- 511,517 ---- { buffer[0] = '\0'; ! frc = (intmax_t)fgets(buffer,254,fp); //phPROGRESS("(%d)buf-%s\n",errno,buffer); ! if (frc != EOF) { while ((buffer[i] != '\0') && (buffer[i] != '#')) i++; *************** *** 670,695 **** char from_filename[255]; ! uint8_t *crop_buffer = NULL; ! uint32_t crop_buffersize= 0; ! uint32_t crop_imgsize = 0; ! ! uint8_t *from_imgptr = NULL; ! uint8_t *crop_imgptr = NULL; ! ! uint32_t from_width = 0; ! uint32_t from_height = 0; ! uint32_t from_depth = 0; ! uint32_t from_format = 0; ! uint32_t from_row_stride= 0; ! ! uint32_t crop_width = 0; ! uint32_t crop_height = 0; ! uint32_t crop_format = 0; ! uint32_t crop_row_stride= 0; ! ! uint32_t to_width = 0; ! uint32_t to_height = 0; ! ! uint32_t h = 0; /* --- 671,676 ---- char from_filename[255]; ! uint32_t to_width = 0; ! uint32_t to_height = 0; /* *************** *** 746,794 **** } ! if (img->x1 < 0) img->x1 = 0; ! if (img->y1 < 0) img->y1 = 0; ! if (img->x2 < 0) img->x2 = 0; ! if (img->y2 < 0) img->y2 = 0; ! if (img->x1 >= image.getWidth()) img->x1 = image.getWidth()-1; ! if (img->y1 >= image.getHeight()) img->y1 = image.getHeight()-1; ! if (img->x2 >= image.getWidth()) img->x2 = image.getWidth()-1; ! if (img->y2 >= image.getHeight()) img->y2 = image.getHeight()-1; ! if (img->x1 > img->x2) img->x1 = img->x2; ! if (img->y1 > img->y2) img->y1 = img->y2; ! if (img->x2 < img->x1) img->x2 = img->x1; ! if (img->y2 < img->y1) img->y2 = img->y1; ! ! crop_width = img->x2 - img->x1; ! crop_height = img->y2 - img->y1; ! ! crop_imgsize = phIMAGE_SIZE(crop_width, ! crop_height, ! image.getFormat()); ! ! phDALLOC(crop_buffer,crop_buffersize,crop_imgsize,uint8_t); ! ! from_imgptr = (uint8_t*)image.getImage(); ! ! from_width = image.getWidth(); ! from_height = image.getHeight(); ! crop_format = from_format = image.getFormat(); ! from_depth = phImageFormatToDepth(from_format); ! from_row_stride = from_width * from_depth; ! from_imgptr += (img->x1 + img->y1 * from_width) * from_depth; ! ! crop_row_stride = ((img->x2 - img->x1)) * from_depth; ! crop_imgptr = crop_buffer; ! ! //phPRINT("Copy %u %u %u-%u\n",from_row_stride, crop_row_stride, img->y1, img->y2); ! for (h = img->y1; h < img->y2; h++, from_imgptr += from_row_stride, crop_imgptr += crop_row_stride) ! { ! //phPRINT("%d\t",h); ! phMemcpy(crop_imgptr,from_imgptr,crop_row_stride); ! } ! //phPRINT("%d\n",h); ! ! //phPRINT("%d %d\n",crop_width, crop_height); ! rc = image.setImage(crop_width,crop_height,crop_format,0,crop_buffer); ! phCHECK_RC(rc,NULL,"image.setImage()"); rc = image.resize(to_width,to_height); --- 727,732 ---- } ! rc = image.crop(img->x1,img->y1,img->x2,img->y2); ! phCHECK_RC(rc,NULL,"image.crop()"); rc = image.resize(to_width,to_height); *************** *** 808,816 **** phPRINT("\n"); - phFree(crop_buffer); - return phSUCCESS; error: - phFree(crop_buffer); return phFAIL; --- 746,751 ---- |