[Phission-cvs] phission/base/include ImageUtil.h,1.5,1.6 phImage.h,1.23,1.24

[Philip T. <pt...@us...>]

Update of /cvsroot/phission/phission/base/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27969/base/include

Modified Files:
	ImageUtil.h phImage.h 
Log Message:

Created an image cropping function in ImageUtil.c/h
Took it from code that I wrote in MLImageNeuralNetwork

Added cropping functionality to the phImage class in a similar manner to the resize code



Index: phImage.h
===================================================================
RCS file: /cvsroot/phission/phission/base/include/phImage.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** phImage.h	21 Sep 2005 22:53:53 -0000	1.23
--- phImage.h	30 Nov 2005 23:10:19 -0000	1.24
***************
*** 78,81 ****
--- 78,88 ----
      uint8_t    *m_resize_buf;
      uint32_t    m_resize_buf_size;
+    
+     /* for cropping images */
+     int         initCrop();
+     int         resetCrop();
+     
+     uint8_t     *m_crop_buf;
+     uint32_t    m_crop_buf_size;
      
      /* for ZLIB compression */
***************
*** 175,178 ****
--- 182,188 ----
                  uint32_t algorithm = phResizeNN);
  
+     int crop( uint32_t x1, uint32_t y1, 
+               uint32_t x2, uint32_t y2 );
+     
      /* Converts from the current format to the specified format */
      /* Checks the format for against the "to_format" variable,

Index: ImageUtil.h
===================================================================
RCS file: /cvsroot/phission/phission/base/include/ImageUtil.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ImageUtil.h	20 Sep 2004 22:39:14 -0000	1.5
--- ImageUtil.h	30 Nov 2005 23:10:19 -0000	1.6
***************
*** 93,96 ****
--- 93,112 ----
  
  /* ------------------------------------------------------------------------- */
+ /* Image crop function */
+ /* ------------------------------------------------------------------------- */
+ int ph_image_crop(uint8_t           *imgptr,
+                   const uint32_t    in_w,  /* input width */
+                   const uint32_t    in_h,  /* input height */
+                   const uint32_t    in_f,  /* input format */
+                   uint32_t          x1,
+                   uint32_t          y1,
+                   uint32_t          x2,
+                   uint32_t          y2,
+                   uint8_t           **pcropped_image,
+                   uint32_t          *ps,
+                   uint32_t          *pw,
+                   uint32_t          *ph );
+ 
+ /* ------------------------------------------------------------------------- */
  #ifdef __cplusplus
  };