wavelet-commit Mailing List for Wavelet (Page 5)
Status: Beta
Brought to you by:
herbert
Menu
▾
▴
wavelet-commit
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(16) |
Aug
(16) |
Sep
|
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(5) |
Jun
|
Jul
|
Aug
(17) |
Sep
(3) |
Oct
|
Nov
|
Dec
(1) |
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
(10) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
(2) |
Mar
|
Apr
(12) |
May
(6) |
Jun
(3) |
Jul
(1) |
Aug
|
Sep
(3) |
Oct
(5) |
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
(6) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
|
|
From: Herbert M. D. <he...@us...> - 2005-07-13 13:56:09
|
Update of /cvsroot/wavelet/Wavelet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20244 Modified Files: ChangeLog Image.cc Log Message: Fixed Image::gammaCorrection() for more than 256 color steps. Index: Image.cc =================================================================== RCS file: /cvsroot/wavelet/Wavelet/Image.cc,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** Image.cc 13 Jul 2005 13:15:06 -0000 1.17 --- Image.cc 13 Jul 2005 13:55:53 -0000 1.18 *************** *** 250,258 **** coeff norm = 255.0; coeff lift = 0.0; ! static coeff replaceTable[256]; if (iMin >= 0 && iMax <= 255) { ! norm = max - min; } --- 250,261 ---- coeff norm = 255.0; coeff lift = 0.0; ! coeff cRange = max - min; ! int tableSize = (int)(cRange + 0.5); ! ! coeff *replaceTable = NEW (coeff[tableSize]); if (iMin >= 0 && iMax <= 255) { ! norm = cRange; } *************** *** 263,267 **** replaceTable[0] = 0.0; ! for (int i = 1; i < (int)sizeof (replaceTable); i++) { replaceTable[i] = norm * pow ((coeff)i / norm, 1.0 / factor) - lift; --- 266,270 ---- replaceTable[0] = 0.0; ! for (int i = 1; i < tableSize; i++) { replaceTable[i] = norm * pow ((coeff)i / norm, 1.0 / factor) - lift; *************** *** 271,274 **** --- 274,279 ---- to (i , replaceTable[(int)(at (i) + lift)]); } + + DELETE (replaceTable); } Index: ChangeLog =================================================================== RCS file: /cvsroot/wavelet/Wavelet/ChangeLog,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** ChangeLog 8 Apr 2005 08:17:32 -0000 1.21 --- ChangeLog 13 Jul 2005 13:55:53 -0000 1.22 *************** *** 1,2 **** --- 1,7 ---- + 2005-07-13 Herbert <he...@sp...> + * Optimized Image::gammaCorrection() + * New Image::gammaCorrectionAuto() + * Fixed Image::histEqualize(); explicit color range is necessary! + 2005-04-08 Herbert <he...@sp...> * Fixed code in class VideoArray to make it compile with g++-3.4. No |
|
From: Herbert M. D. <he...@us...> - 2005-07-13 13:56:09
|
Update of /cvsroot/wavelet/Wavelet/WImage In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20244/WImage Modified Files: Image.hh Log Message: Fixed Image::gammaCorrection() for more than 256 color steps. Index: Image.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/Image.hh,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Image.hh 13 Jul 2005 13:15:06 -0000 1.12 --- Image.hh 13 Jul 2005 13:55:53 -0000 1.13 *************** *** 194,202 **** /** Perform a histogram equalisation. ! * The operation performs a floating-point to int quantisation and then ! * sets the color range automatically. For images with all-positive ! * values, the color range 0..255 is assumed. Else other values can ! * be specified for example Haar LL Level 1 would be 0..1023 and Haar non ! * LL Level 1 would be -512..511. * Code provided by Johan Ehlers. * @waring --- 194,202 ---- /** Perform a histogram equalisation. ! * The operation performs a floating-point to int quantisation and uses ! * a given color range if 0..255 is not desired. Explicit values for the ! * color range can be necessary e.g. for Wavelet-decomposed images; for ! * example for Haar LL Level 1 a good choice would be 0..1023 and -512..511 ! * for Haar non LL Level 1. * Code provided by Johan Ehlers. * @waring |
|
From: Herbert M. D. <he...@us...> - 2005-07-13 13:15:15
|
Update of /cvsroot/wavelet/Wavelet/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29349/tools Modified Files: pgmequalize.cc Log Message: Changes to Image::gammaCorrection(), it should now be faster even if the color range is beyond [0..255]. Removed CRs from line ends in pgmequalize.cc. Index: pgmequalize.cc =================================================================== RCS file: /cvsroot/wavelet/Wavelet/tools/pgmequalize.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pgmequalize.cc 18 Feb 2005 12:12:25 -0000 1.2 --- pgmequalize.cc 13 Jul 2005 13:15:07 -0000 1.3 *************** *** 1,98 **** ! /* ! * Equalize an image ! * ! * $Date$ ! * $Revision$ ! * ! */ ! ! #include <iostream> ! #include <stdexcept> ! #include <stdio.h> ! #include <math.h> ! #include <assert.h> ! #include <WImage.hh> ! ! #ifndef __WATCOMC__ ! using namespace std; ! #endif ! ! int ! main (int argc, char *argv[]) ! { ! cout << "pgmequalize version " << WAVE_VERSION << " (c) 2001-2004 by Herbert" ! #ifdef PFI ! << " (pfi support enabled)" ! #endif ! << endl; ! ! char *infile; ! char *outfile; ! Image *image = NEW (StillImage ()); ! int yoffs = 0; ! int xoffs = 0; ! int ysize = 0; ! int xsize = 0; ! ! if (argc < 3 && argc != 7) ! { ! cerr << "Usage: pgmequalize <infile> <outfile> " ! << "[<yoffs> <xoffs> <ysize> <xsize>]" ! << endl; ! return 1; ! } ! ! infile = argv[1]; ! outfile = argv[2]; ! ! if (argc == 7) ! { ! if (sscanf (argv[3], "%d", &yoffs) != 1) ! { ! cerr << "Invalid yoffs: " << argv[3] << endl; ! return 1; ! } ! if (sscanf (argv[4], "%d", &xoffs) != 1) ! { ! cerr << "Invalid xoffs: " << argv[4] << endl; ! return 1; ! } ! if (sscanf (argv[5], "%d", &ysize) != 1) ! { ! cerr << "Invalid ysize: " << argv[5] << endl; ! return 1; ! } ! if (sscanf (argv[6], "%d", &xsize) != 1) ! { ! cerr << "Invalid xsize: " << argv[6] << endl; ! return 1; ! } ! } ! ! try ! { ! image->read (infile); ! } ! catch (const exception &error) ! { ! cerr << "Reading image: " << error.what () << endl; ! return 1; ! } ! ! image->histEqualization (yoffs, xoffs, ysize, xsize); ! ! try ! { ! image->write (outfile); ! } ! catch (const exception &error) ! { ! cerr << "Writing image: " << error.what () << endl; ! return 1; ! } ! ! DELETE (image); ! ! return 0; ! } ! --- 1,98 ---- ! /* ! * Equalize an image ! * ! * $Date$ ! * $Revision$ ! * ! */ ! ! #include <iostream> ! #include <stdexcept> ! #include <stdio.h> ! #include <math.h> ! #include <assert.h> ! #include <WImage.hh> ! ! #ifndef __WATCOMC__ ! using namespace std; ! #endif ! ! int ! main (int argc, char *argv[]) ! { ! cout << "pgmequalize version " << WAVE_VERSION << " (c) 2001-2004 by Herbert" ! #ifdef PFI ! << " (pfi support enabled)" ! #endif ! << endl; ! ! char *infile; ! char *outfile; ! Image *image = NEW (StillImage ()); ! int yoffs = 0; ! int xoffs = 0; ! int ysize = 0; ! int xsize = 0; ! ! if (argc < 3 && argc != 7) ! { ! cerr << "Usage: pgmequalize <infile> <outfile> " ! << "[<yoffs> <xoffs> <ysize> <xsize>]" ! << endl; ! return 1; ! } ! ! infile = argv[1]; ! outfile = argv[2]; ! ! if (argc == 7) ! { ! if (sscanf (argv[3], "%d", &yoffs) != 1) ! { ! cerr << "Invalid yoffs: " << argv[3] << endl; ! return 1; ! } ! if (sscanf (argv[4], "%d", &xoffs) != 1) ! { ! cerr << "Invalid xoffs: " << argv[4] << endl; ! return 1; ! } ! if (sscanf (argv[5], "%d", &ysize) != 1) ! { ! cerr << "Invalid ysize: " << argv[5] << endl; ! return 1; ! } ! if (sscanf (argv[6], "%d", &xsize) != 1) ! { ! cerr << "Invalid xsize: " << argv[6] << endl; ! return 1; ! } ! } ! ! try ! { ! image->read (infile); ! } ! catch (const exception &error) ! { ! cerr << "Reading image: " << error.what () << endl; ! return 1; ! } ! ! image->histEqualization (yoffs, xoffs, ysize, xsize); ! ! try ! { ! image->write (outfile); ! } ! catch (const exception &error) ! { ! cerr << "Writing image: " << error.what () << endl; ! return 1; ! } ! ! DELETE (image); ! ! return 0; ! } ! |
|
From: Herbert M. D. <he...@us...> - 2005-07-13 13:15:15
|
Update of /cvsroot/wavelet/Wavelet/WImage In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29349/WImage Modified Files: Image.hh Log Message: Changes to Image::gammaCorrection(), it should now be faster even if the color range is beyond [0..255]. Removed CRs from line ends in pgmequalize.cc. Index: Image.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/Image.hh,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Image.hh 13 Jul 2005 12:13:23 -0000 1.11 --- Image.hh 13 Jul 2005 13:15:06 -0000 1.12 *************** *** 188,192 **** * Horizontal size * @return ! * the gamma value - ( use it to undo operation if need be )*/ double gammaCorrectionAuto ( int row , int columns , int yoffs = 0 , int xoffs = 0 , int ysize = -1 , --- 188,192 ---- * Horizontal size * @return ! * the gamma value - (use it to undo operation if needed) */ double gammaCorrectionAuto ( int row , int columns , int yoffs = 0 , int xoffs = 0 , int ysize = -1 , |
|
From: Herbert M. D. <he...@us...> - 2005-07-13 13:15:14
|
Update of /cvsroot/wavelet/Wavelet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29349 Modified Files: Image.cc Log Message: Changes to Image::gammaCorrection(), it should now be faster even if the color range is beyond [0..255]. Removed CRs from line ends in pgmequalize.cc. Index: Image.cc =================================================================== RCS file: /cvsroot/wavelet/Wavelet/Image.cc,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Image.cc 13 Jul 2005 12:13:22 -0000 1.16 --- Image.cc 13 Jul 2005 13:15:06 -0000 1.17 *************** *** 250,273 **** coeff norm = 255.0; coeff lift = 0.0; ! if (iMin < 0 || iMax > 255) { norm = max - min; } - else - { - coeff * replaceTable = new coeff[256]; - replaceTable[0] = 0.0; - for ( int i = 1;i < 256;i++ ) - { - replaceTable[i] = norm * pow ((coeff)i / norm, 1.0 / factor); - } - for ( int i = 0;i < m_xysize; i++) - { - to ( i , replaceTable[(int)at(i)] ); - } - DELETE ( replaceTable ); - return; - } if (iMin < 0) --- 250,259 ---- coeff norm = 255.0; coeff lift = 0.0; + static coeff replaceTable[256]; ! if (iMin >= 0 && iMax <= 255) { norm = max - min; } if (iMin < 0) *************** *** 276,286 **** } ! for (int y = yoffs; y < toY; y++) { ! for (int x = xoffs; x < toX; x++) ! { ! to (y, x, ! norm * pow ((at (y, x) + lift) / norm, 1.0 / factor) - lift); ! } } } --- 262,273 ---- } ! replaceTable[0] = 0.0; ! for (int i = 1; i < (int)sizeof (replaceTable); i++) { ! replaceTable[i] = norm * pow ((coeff)i / norm, 1.0 / factor) - lift; ! } ! for (int i = 0; i < m_xysize; i++) ! { ! to (i , replaceTable[(int)(at (i) + lift)]); } } *************** *** 290,294 **** int xoffs, int ysize, int xsize) { ! if ( (yoffs < 0) || (yoffs >= this->rows() ) ) { yoffs = 0; --- 277,281 ---- int xoffs, int ysize, int xsize) { ! if ((yoffs < 0) || (yoffs >= this->rows ())) { yoffs = 0; *************** *** 313,329 **** int subX = toX - xoffs; ! columns = MIN(subX,columns); ! rows = MIN(subY,rows); ! while ( ( subX % columns ) != 0 ) { columns--; } ! while ( ( subY % rows ) != 0 ) { rows--; } ! coeff * average = new coeff[rows*columns]; int width = subX / columns; --- 300,316 ---- int subX = toX - xoffs; ! columns = MIN (subX,columns); ! rows = MIN (subY,rows); ! while ((subX % columns) != 0) { columns--; } ! while ((subY % rows) != 0) { rows--; } ! coeff * average = NEW (coeff[rows*columns]); int width = subX / columns; *************** *** 338,356 **** // Average pixel value of the local area average[iy+(ix*rows)] = saverage (y , x, y + width, x + height); ! if ( !ix && !iy ) { // i.e. first loop ! min = average[iy+(ix*rows)]; ! max = average[iy+(ix*rows)]; } else { ! if (min > average[iy+(ix*rows)] ) { ! min = average[iy+(ix*rows)]; } ! else if (max < average[iy+(ix*rows)] ) { ! max = average[iy+(ix*rows)]; } } --- 325,343 ---- // Average pixel value of the local area average[iy+(ix*rows)] = saverage (y , x, y + width, x + height); ! if (!ix && !iy) { // i.e. first loop ! min = average[iy + (ix * rows)]; ! max = average[iy + (ix * rows)]; } else { ! if (min > average[iy + (ix * rows)]) { ! min = average[iy + (ix * rows)]; } ! else if (max < average[iy + (ix * rows)]) { ! max = average[iy + (ix * rows)]; } } *************** *** 358,366 **** } ! DELETE(average); double gammaContrast = 1 - ((float)(max - min) / (max + min)); ! gammaCorrection ( 1.0/gammaContrast , yoffs , xoffs , ysize , xsize ); return gammaContrast; --- 345,353 ---- } ! DELETE (average); double gammaContrast = 1 - ((float)(max - min) / (max + min)); ! gammaCorrection (1.0 / gammaContrast , yoffs , xoffs , ysize , xsize); return gammaContrast; *************** *** 391,398 **** } ! int cRange = (endH+1) - startH; bool lifted = false; ! if ( lifted = (startH < 0) ) { for (int y = yoffs; y < toY; y++) --- 378,385 ---- } ! int cRange = (endH + 1) - startH; bool lifted = false; ! if (lifted = (startH < 0)) { for (int y = yoffs; y < toY; y++) *************** *** 401,405 **** { // int temp = tools_coeff2int (at (y, x)); ! to (y, x, at (y, x) - startH ); // int newint = at (y,x); // ASSERT ( (at (y,x) >= 0) && (at (y,x) <= cRange) ); --- 388,392 ---- { // int temp = tools_coeff2int (at (y, x)); ! to (y, x, at (y, x) - startH); // int newint = at (y,x); // ASSERT ( (at (y,x) >= 0) && (at (y,x) <= cRange) ); |
|
From: Johan H. E. <bo...@us...> - 2005-07-13 12:13:31
|
Update of /cvsroot/wavelet/Wavelet/WImage In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29033/WImage Modified Files: Image.hh debug.h tools.h Log Message: Made following changes to "Image" class: ------------------------------------------------------------------------------------------------------------ 1.Fixed histogram equalization function to work on non - spatial images. 2.Speed optimized gamma function. 3.Added a auto-gamma function. ------------------------------------------------------------------------------------------------------------ Added coeffecient to int function in "tools.h / tools.cc". Added to macro in "debug.h" to disable debug_printf for WIN CE. Index: tools.h =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/tools.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** tools.h 3 Jun 2005 14:02:04 -0000 1.4 --- tools.h 13 Jul 2005 12:13:23 -0000 1.5 *************** *** 21,24 **** --- 21,30 ---- pixel tools_coeff2pixel (coeff c); + /** Convert a coeff value to a integer + * @param c + * the coefficient + * @return the integer value */ + int tools_coeff2int ( coeff c); + /** Return true if two double values are equal * @param d1 the first value Index: Image.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/Image.hh,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Image.hh 12 Jul 2005 14:52:18 -0000 1.10 --- Image.hh 13 Jul 2005 12:13:23 -0000 1.11 *************** *** 168,177 **** int ysize = -1, int xsize = -1); ! /** Perform a histogram equalization. ! * The operation performs a floatingpoint to int quantization and then * sets the color range automatically. For images with all-positive ! * values, the color range 0..255 is assumed, else it is calculated from ! * the minimal and maximal intensity values. ! * Code provided by Johan Ehlers * @param ysize * the horizontal size of the region to process --- 168,206 ---- int ysize = -1, int xsize = -1); ! /** Does a automatic gamma correction. This function breaks the image up into ! * smaller matrices and then calculates their averages. The highest and ! * lowest average is then used to calculate a gamma value which is used ! * to a parameter in a call to gammaCorrection(). ! * @note ! * If the image can not be split into the required sub-areas without a ! * remainder the nearest solution (down) is used. ! * @param rows ! * Split image horizontly into subsections ! * @param columns ! * Split image vertically into subsections ! * @param yoffs ! * Vertical offset ! * @param xoffs ! * Horizontal offset ! * @param ysize ! * Vertical size ! * @param xsize ! * Horizontal size ! * @return ! * the gamma value - ( use it to undo operation if need be )*/ ! double gammaCorrectionAuto ( int row , int columns , int yoffs = 0 , ! int xoffs = 0 , int ysize = -1 , ! int xsize = -1 ); ! ! /** Perform a histogram equalisation. ! * The operation performs a floating-point to int quantisation and then * sets the color range automatically. For images with all-positive ! * values, the color range 0..255 is assumed. Else other values can ! * be specified for example Haar LL Level 1 would be 0..1023 and Haar non ! * LL Level 1 would be -512..511. ! * Code provided by Johan Ehlers. ! * @waring ! * Use unnormalised coefficients else the operation has un-determinable ! * results. * @param ysize * the horizontal size of the region to process *************** *** 181,187 **** * the horizontal offset of the region to process * @param xoffs ! * the vertical offset of the region to process */ virtual void histEqualization (int yoffs = 0, int xoffs = 0, ! int ysize = -1, int xsize = -1); /** Do an intelligent kind of beautification considering previous --- 210,221 ---- * the horizontal offset of the region to process * @param xoffs ! * the vertical offset of the region to process ! * @param startH ! * the start value for range of histogram default = 0 ! * @param endH ! * the end value for the range of the histogram default = 255*/ virtual void histEqualization (int yoffs = 0, int xoffs = 0, ! int ysize = -1, int xsize = -1, ! int startH = 0, int endH = 255); /** Do an intelligent kind of beautification considering previous Index: debug.h =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/debug.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** debug.h 3 Jun 2005 14:02:04 -0000 1.2 --- debug.h 13 Jul 2005 12:13:23 -0000 1.3 *************** *** 13,17 **** * @{ */ ! #if !defined (NDEBUG) && !defined (DPRINTF) int debug_printf (const char *tmpl, ...); --- 13,17 ---- * @{ */ ! #if !defined (NDEBUG) && !defined (DPRINTF) && !defined (_WIN32_WCE) int debug_printf (const char *tmpl, ...); |
|
From: Johan H. E. <bo...@us...> - 2005-07-13 12:13:31
|
Update of /cvsroot/wavelet/Wavelet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29033 Modified Files: Image.cc tools.cc Log Message: Made following changes to "Image" class: ------------------------------------------------------------------------------------------------------------ 1.Fixed histogram equalization function to work on non - spatial images. 2.Speed optimized gamma function. 3.Added a auto-gamma function. ------------------------------------------------------------------------------------------------------------ Added coeffecient to int function in "tools.h / tools.cc". Added to macro in "debug.h" to disable debug_printf for WIN CE. Index: Image.cc =================================================================== RCS file: /cvsroot/wavelet/Wavelet/Image.cc,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Image.cc 22 Mar 2005 17:28:20 -0000 1.15 --- Image.cc 13 Jul 2005 12:13:22 -0000 1.16 *************** *** 255,258 **** --- 255,273 ---- norm = max - min; } + else + { + coeff * replaceTable = new coeff[256]; + replaceTable[0] = 0.0; + for ( int i = 1;i < 256;i++ ) + { + replaceTable[i] = norm * pow ((coeff)i / norm, 1.0 / factor); + } + for ( int i = 0;i < m_xysize; i++) + { + to ( i , replaceTable[(int)at(i)] ); + } + DELETE ( replaceTable ); + return; + } if (iMin < 0) *************** *** 271,276 **** } void ! Image::histEqualization (int yoffs, int xoffs, int ysize, int xsize) { if (yoffs < 0 || yoffs >= rows ()) --- 286,373 ---- } + double + Image::gammaCorrectionAuto ( int rows , int columns , int yoffs, + int xoffs, int ysize, int xsize) + { + if ( (yoffs < 0) || (yoffs >= this->rows() ) ) + { + yoffs = 0; + } + if (xoffs < 0 || xoffs >= this->cols ()) + { + xoffs = 0; + } + int toY = (ysize <= 0? this->rows (): (yoffs + ysize)); + int toX = (xsize <= 0? this->cols (): (xoffs + xsize)); + + if (toY >= this->rows ()) + { + toY = this->rows (); + } + if (toX >= this->cols ()) + { + toX = this->cols (); + } + + int subY = toY - yoffs; + int subX = toX - xoffs; + + columns = MIN(subX,columns); + rows = MIN(subY,rows); + + while ( ( subX % columns ) != 0 ) + { + columns--; + } + while ( ( subY % rows ) != 0 ) + { + rows--; + } + + coeff * average = new coeff[rows*columns]; + + int width = subX / columns; + int height = subY / rows; + + // Local average pixel values + double min = 0.0, max = 0.0; + for (int ix = 0, x = 0; ix < columns ; ix++, x += height) + { + for (int iy = 0, y = 0; iy < rows ; iy++, y += width) + { + // Average pixel value of the local area + average[iy+(ix*rows)] = saverage (y , x, y + width, x + height); + if ( !ix && !iy ) + { + // i.e. first loop + min = average[iy+(ix*rows)]; + max = average[iy+(ix*rows)]; + } + else + { + if (min > average[iy+(ix*rows)] ) + { + min = average[iy+(ix*rows)]; + } + else if (max < average[iy+(ix*rows)] ) + { + max = average[iy+(ix*rows)]; + } + } + } + } + + DELETE(average); + + double gammaContrast = 1 - ((float)(max - min) / (max + min)); + + gammaCorrection ( 1.0/gammaContrast , yoffs , xoffs , ysize , xsize ); + + return gammaContrast; + } + void ! Image::histEqualization (int yoffs, int xoffs, int ysize, int xsize, ! int startH, int endH) { if (yoffs < 0 || yoffs >= rows ()) *************** *** 293,319 **** toX = cols (); } ! coeff min = smin (yoffs, xoffs, toY, toX); ! coeff max = smax (yoffs, xoffs, toY, toX); ! coeff amin = fabs (min); ! int iMin = tools_coeff2pixel (min - 0.5); ! int iMax = tools_coeff2pixel (max + 0.5); bool lifted = false; - int cRange = 0; ! if (iMin < 0) { for (int y = yoffs; y < toY; y++) ! { for (int x = xoffs; x < toX; x++) { ! to (y, x, at (y, x) + amin); } } - lifted = true; - cRange = iMax - iMin; - } - else - { - cRange = iMax > 256? iMax: 256; } --- 390,409 ---- toX = cols (); } ! ! int cRange = (endH+1) - startH; bool lifted = false; ! if ( lifted = (startH < 0) ) { for (int y = yoffs; y < toY; y++) ! { for (int x = xoffs; x < toX; x++) { ! // int temp = tools_coeff2int (at (y, x)); ! to (y, x, at (y, x) - startH ); ! // int newint = at (y,x); ! // ASSERT ( (at (y,x) >= 0) && (at (y,x) <= cRange) ); } } } *************** *** 334,339 **** } ! // STEP ONE ! // Construct the histogram. for (int y = yoffs; y < toY; y++) --- 424,429 ---- } ! // STEP ONE ! // Construct the histogram. for (int y = yoffs; y < toY; y++) *************** *** 341,345 **** for (int x = xoffs; x < toX; x++) { ! freqDistr[tools_coeff2pixel (at (y, x))]++; } } --- 431,437 ---- for (int x = xoffs; x < toX; x++) { ! // int temp = tools_coeff2int (at (y, x)); ! // ASSERT ( (at (y,x) >= 0) && (at (y,x) <= cRange) ); ! freqDistr[tools_coeff2int (at (y, x))]++; } } *************** *** 462,466 **** for (int x = xoffs; x < toX; x++) { ! coeff mapped = (coeff)(mappingTable[tools_coeff2pixel (at (y, x))]); to (y, x, mapped); } --- 554,558 ---- for (int x = xoffs; x < toX; x++) { ! coeff mapped = (coeff)(mappingTable[tools_coeff2int (at (y, x))]); to (y, x, mapped); } *************** *** 473,477 **** for (int x = xoffs; x < toX; x++) { ! to (y, x, at (y, x) - amin); } } --- 565,569 ---- for (int x = xoffs; x < toX; x++) { ! to (y, x, at (y, x) + startH); } } Index: tools.cc =================================================================== RCS file: /cvsroot/wavelet/Wavelet/tools.cc,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tools.cc 22 Mar 2005 15:51:21 -0000 1.5 --- tools.cc 13 Jul 2005 12:13:23 -0000 1.6 *************** *** 22,25 **** --- 22,31 ---- } + int + tools_coeff2int ( coeff c) + { + return (int)(c + 0.5); + } + bool tools_equals (double d1, double d2) |
Update of /cvsroot/wavelet/Wavelet/WImage In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21335/WImage Modified Files: AviReader.hh AviWriter.hh CoeffInformation.hh ColorBuffer.hh ColorImage.hh ColorVideo.hh ColumnVector.hh FileName.hh FullVector.hh GreymapFile.hh GreymapReader.hh GreymapWriter.hh Image.hh ImageArray.hh ImageVector.hh JpgReader.hh JpgWriter.hh PfcReader.hh PfcWriter.hh PfgReader.hh PfgWriter.hh PgmReader.hh PgmWriter.hh PixmapFile.hh PixmapReader.hh PixmapWriter.hh PpmReader.hh PpmWriter.hh RawReader.hh RawWriter.hh ReferenceVector.hh RowVector.hh StillImage.hh VidReader.hh VidWriter.hh VideoArray.hh VideoFile.hh VideoFrame.hh VideoReader.hh VideoWriter.hh Log Message: Fixed doxygen documentation. Index: PfgWriter.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/PfgWriter.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PfgWriter.hh 3 Jun 2005 14:02:03 -0000 1.2 --- PfgWriter.hh 12 Jul 2005 14:52:18 -0000 1.3 *************** *** 17,21 **** /** - * @class PfgWriter * A PFG image file writer. Dimensions are known from the {\em ImageArray} * object. Only grey-scale PFGs are supported. --- 17,20 ---- Index: RawWriter.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/RawWriter.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RawWriter.hh 3 Jun 2005 14:02:03 -0000 1.2 --- RawWriter.hh 12 Jul 2005 14:52:19 -0000 1.3 *************** *** 17,21 **** /** - * @class RawWriter * A RAW image file writer. Dimensions are known from the {\em ImageArray} * object. --- 17,20 ---- Index: AviReader.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/AviReader.hh,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** AviReader.hh 3 Jun 2005 14:02:03 -0000 1.6 --- AviReader.hh 12 Jul 2005 14:52:18 -0000 1.7 *************** *** 17,21 **** /** - * @class AviReader * An AVI file reader. Only uncompressed AVIs are supported. */ --- 17,20 ---- Index: FileName.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/FileName.hh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FileName.hh 3 Jun 2005 14:02:03 -0000 1.3 --- FileName.hh 12 Jul 2005 14:52:18 -0000 1.4 *************** *** 23,27 **** /** - * @class FileName * File names. This splits a DOS- or Unix-like filespec into its * parts (dir, name without extension, extension) and guesses what --- 23,26 ---- Index: JpgWriter.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/JpgWriter.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JpgWriter.hh 3 Jun 2005 14:02:03 -0000 1.2 --- JpgWriter.hh 12 Jul 2005 14:52:18 -0000 1.3 *************** *** 17,21 **** /** - * @class JpgWriter * A JPG image file writer. Dimensions are known from the {\em Image} * object. Only JPG version 6 is supported. --- 17,20 ---- Index: ColumnVector.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/ColumnVector.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ColumnVector.hh 3 Jun 2005 14:02:03 -0000 1.2 --- ColumnVector.hh 12 Jul 2005 14:52:18 -0000 1.3 *************** *** 17,21 **** /** - * @class ColumnVector * Column-reference. A reference to a two-dimensional array's column. */ --- 17,20 ---- Index: ColorVideo.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/ColorVideo.hh,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ColorVideo.hh 3 Jun 2005 14:02:03 -0000 1.9 --- ColorVideo.hh 12 Jul 2005 14:52:18 -0000 1.10 *************** *** 18,22 **** /** - * @class ColorVideo * An wrapper for videos containing several color components. * Objects may import and export different video formats, --- 18,21 ---- Index: GreymapWriter.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/GreymapWriter.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GreymapWriter.hh 3 Jun 2005 14:02:03 -0000 1.2 --- GreymapWriter.hh 12 Jul 2005 14:52:18 -0000 1.3 *************** *** 17,21 **** /** - * @class GreymapWriter * An abstract image writer. The image is being written putting its content * from an {\em ImageArray} object into the file. A reference to the object --- 17,20 ---- Index: VideoArray.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/VideoArray.hh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** VideoArray.hh 3 Jun 2005 14:02:04 -0000 1.5 --- VideoArray.hh 12 Jul 2005 14:52:19 -0000 1.6 *************** *** 17,21 **** /** - * @class VideoArray * A two-dimensional array wrapper. This allows us to access the video's * pixels or coefficients and provides some utility methods. It is the --- 17,20 ---- Index: VideoWriter.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/VideoWriter.hh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** VideoWriter.hh 3 Jun 2005 14:02:04 -0000 1.3 --- VideoWriter.hh 12 Jul 2005 14:52:19 -0000 1.4 *************** *** 17,21 **** /** - * @class VideoWriter * An abstract video writer. The video is being written putting its content * from an array of greyscale video objects into the file. --- 17,20 ---- Index: GreymapFile.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/GreymapFile.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GreymapFile.hh 3 Jun 2005 14:02:03 -0000 1.2 --- GreymapFile.hh 12 Jul 2005 14:52:18 -0000 1.3 *************** *** 18,22 **** /** - * @class GreymapFile * An abstract image file. A framework to create readers and writers on * any greyscale images. --- 18,21 ---- Index: GreymapReader.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/GreymapReader.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GreymapReader.hh 3 Jun 2005 14:02:03 -0000 1.2 --- GreymapReader.hh 12 Jul 2005 14:52:18 -0000 1.3 *************** *** 18,22 **** /** - * @class GreymapReader * An abstract greyscale image reader. The image is being read putting its * content into an {\em ImageArray} object. A reference to such an object is --- 18,21 ---- Index: FullVector.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/FullVector.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FullVector.hh 3 Jun 2005 14:02:03 -0000 1.2 --- FullVector.hh 12 Jul 2005 14:52:18 -0000 1.3 *************** *** 17,21 **** /** - * @class FullVector * Full reference. A reference to a one-dimensional array. */ --- 17,20 ---- Index: PfgReader.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/PfgReader.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PfgReader.hh 3 Jun 2005 14:02:03 -0000 1.2 --- PfgReader.hh 12 Jul 2005 14:52:18 -0000 1.3 *************** *** 17,21 **** /** - * @class PfgReader * A PFG file reader. Only grey-scale PFGs are supported. */ --- 17,20 ---- Index: PixmapReader.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/PixmapReader.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PixmapReader.hh 3 Jun 2005 14:02:03 -0000 1.2 --- PixmapReader.hh 12 Jul 2005 14:52:18 -0000 1.3 *************** *** 18,22 **** /** - * @class PixmapReader * An abstract color image reader. The image is being read putting its * color channels into separate greyscale image objects. --- 18,21 ---- Index: VideoReader.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/VideoReader.hh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** VideoReader.hh 3 Jun 2005 14:02:04 -0000 1.4 --- VideoReader.hh 12 Jul 2005 14:52:19 -0000 1.5 *************** *** 18,22 **** /** - * @class VideoReader * An abstract color video reader. The video is being read putting its * color channels into separate greyscale video objects. --- 18,21 ---- Index: PpmReader.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/PpmReader.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PpmReader.hh 3 Jun 2005 14:02:03 -0000 1.2 --- PpmReader.hh 12 Jul 2005 14:52:19 -0000 1.3 *************** *** 17,21 **** /** - * @class PpmReader * A PPM file reader. Only PPMs version 6 are supported. */ --- 17,20 ---- Index: StillImage.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/StillImage.hh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** StillImage.hh 3 Jun 2005 14:02:03 -0000 1.4 --- StillImage.hh 12 Jul 2005 14:52:19 -0000 1.5 *************** *** 17,21 **** /** - * @class StillImage * A still image. A (grey-scale) two-dimensional image. */ --- 17,20 ---- Index: VideoFrame.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/VideoFrame.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** VideoFrame.hh 3 Jun 2005 14:02:04 -0000 1.2 --- VideoFrame.hh 12 Jul 2005 14:52:19 -0000 1.3 *************** *** 18,22 **** /** - * @class VideoFrame * A video frame in black-white. Almost identical to StillImage, contains * some optimization stuff for videos. --- 18,21 ---- Index: ColorImage.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/ColorImage.hh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ColorImage.hh 3 Jun 2005 14:02:03 -0000 1.4 --- ColorImage.hh 12 Jul 2005 14:52:18 -0000 1.5 *************** *** 18,22 **** /** - * @class ColorImage * An image wrapper for bitmap images of three color components. * Objects may import and export different bitmap formats, --- 18,21 ---- Index: VidWriter.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/VidWriter.hh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** VidWriter.hh 3 Jun 2005 14:02:04 -0000 1.4 --- VidWriter.hh 12 Jul 2005 14:52:19 -0000 1.5 *************** *** 17,21 **** /** - * @class VidWriter * A VID video file writer. Dimensions are known from the {\em Image} * object. --- 17,20 ---- Index: PgmWriter.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/PgmWriter.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PgmWriter.hh 3 Jun 2005 14:02:03 -0000 1.2 --- PgmWriter.hh 12 Jul 2005 14:52:18 -0000 1.3 *************** *** 17,21 **** /** - * @class PgmWriter * A PGM image file writer. Dimensions are known from the {\em ImageArray} * object. Only PGM version 5 is supported. --- 17,20 ---- Index: RowVector.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/RowVector.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RowVector.hh 3 Jun 2005 14:02:03 -0000 1.2 --- RowVector.hh 12 Jul 2005 14:52:19 -0000 1.3 *************** *** 17,21 **** /** - * @class RowVector * Row-reference. A reference to a two-dimensional array's row. */ --- 17,20 ---- Index: RawReader.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/RawReader.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RawReader.hh 3 Jun 2005 14:02:03 -0000 1.2 --- RawReader.hh 12 Jul 2005 14:52:19 -0000 1.3 *************** *** 16,20 **** * @{ */ /** - * @class RawReader * A RAW file reader. Dimensions and a read offset can be specified * through additional arguments to the constructor or through some methods. --- 16,19 ---- Index: JpgReader.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/JpgReader.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JpgReader.hh 3 Jun 2005 14:02:03 -0000 1.2 --- JpgReader.hh 12 Jul 2005 14:52:18 -0000 1.3 *************** *** 17,21 **** /** - * @class JpgReader * A JPG file reader. Only JPGs version 6 are supported. * --- 17,20 ---- Index: VidReader.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/VidReader.hh,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** VidReader.hh 3 Jun 2005 14:02:03 -0000 1.6 --- VidReader.hh 12 Jul 2005 14:52:19 -0000 1.7 *************** *** 17,21 **** /** - * @class VidReader * A VID file reader. */ --- 17,20 ---- Index: Image.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/Image.hh,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Image.hh 3 Jun 2005 14:02:03 -0000 1.9 --- Image.hh 12 Jul 2005 14:52:18 -0000 1.10 *************** *** 24,28 **** /** - * @class Image * An image (abstract). A (grey-scale) more-than-one-dimensional image. */ --- 24,27 ---- Index: ColorBuffer.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/ColorBuffer.hh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ColorBuffer.hh 3 Jun 2005 14:02:03 -0000 1.5 --- ColorBuffer.hh 12 Jul 2005 14:52:18 -0000 1.6 *************** *** 17,21 **** /** - * @class ColorBuffer * An abstract wrapper for color images and videos. */ --- 17,20 ---- Index: AviWriter.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/AviWriter.hh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AviWriter.hh 3 Jun 2005 14:02:03 -0000 1.3 --- AviWriter.hh 12 Jul 2005 14:52:18 -0000 1.4 *************** *** 17,21 **** /** - * @class AviWriter * A AVI image file writer. */ --- 17,20 ---- Index: CoeffInformation.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/CoeffInformation.hh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CoeffInformation.hh 3 Jun 2005 14:02:03 -0000 1.3 --- CoeffInformation.hh 12 Jul 2005 14:52:18 -0000 1.4 *************** *** 17,21 **** /** - * @class CoeffInformation * Coefficient information. The information consists of value, x-offset, * y-offset and absolute offset. This is used for statistics and to obtain --- 17,20 ---- Index: ImageVector.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/ImageVector.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ImageVector.hh 3 Jun 2005 14:02:03 -0000 1.2 --- ImageVector.hh 12 Jul 2005 14:52:18 -0000 1.3 *************** *** 19,23 **** /** - * @class ImageVector * Pseudo-vector (abstract) for use with two-dimensional objects, like * images. Provide a two-dimensional array's rows and columns as --- 19,22 ---- Index: VideoFile.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/VideoFile.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** VideoFile.hh 3 Jun 2005 14:02:04 -0000 1.2 --- VideoFile.hh 12 Jul 2005 14:52:19 -0000 1.3 *************** *** 18,22 **** /** - * @class VideoFile * An abstract image file. A framework to create readers and writers on * any color images. --- 18,21 ---- Index: ImageArray.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/ImageArray.hh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ImageArray.hh 3 Jun 2005 14:02:03 -0000 1.3 --- ImageArray.hh 12 Jul 2005 14:52:18 -0000 1.4 *************** *** 17,21 **** /** - * @class ImageArray * A two-dimensional array wrapper. This allows us to access the image's * pixels or coefficients and provides some utility methods. It is the --- 17,20 ---- Index: PfcWriter.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/PfcWriter.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PfcWriter.hh 3 Jun 2005 14:02:03 -0000 1.2 --- PfcWriter.hh 12 Jul 2005 14:52:18 -0000 1.3 *************** *** 16,20 **** * @{ */ /** - * @class PfcWriter * A PFC image file writer. Dimensions are known from the {\em Image} * object. Only PFC version 6 is supported. --- 16,19 ---- Index: PgmReader.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/PgmReader.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PgmReader.hh 3 Jun 2005 14:02:03 -0000 1.2 --- PgmReader.hh 12 Jul 2005 14:52:18 -0000 1.3 *************** *** 17,21 **** /** - * @class PgmReader * A PGM file reader. Only PGMs version 5 are supported. */ --- 17,20 ---- Index: ReferenceVector.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/ReferenceVector.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ReferenceVector.hh 3 Jun 2005 14:02:03 -0000 1.2 --- ReferenceVector.hh 12 Jul 2005 14:52:19 -0000 1.3 *************** *** 17,21 **** /** - * @class ReferenceVector * Pseudo-vector (abstract). Provide a two-dimensional array's * rows and columns as vectors with array addressing. --- 17,20 ---- Index: PixmapFile.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/PixmapFile.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PixmapFile.hh 3 Jun 2005 14:02:03 -0000 1.2 --- PixmapFile.hh 12 Jul 2005 14:52:18 -0000 1.3 *************** *** 18,22 **** /** - * @class PixmapFile * An abstract image file. A framework to create readers and writers on * any color images. --- 18,21 ---- Index: PixmapWriter.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/PixmapWriter.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PixmapWriter.hh 3 Jun 2005 14:02:03 -0000 1.2 --- PixmapWriter.hh 12 Jul 2005 14:52:18 -0000 1.3 *************** *** 17,21 **** /** - * @class PixmapWriter * An abstract image writer. The image is being written putting its content * from an array of greyscale image objects into the file. --- 17,20 ---- Index: PpmWriter.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/PpmWriter.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PpmWriter.hh 3 Jun 2005 14:02:03 -0000 1.2 --- PpmWriter.hh 12 Jul 2005 14:52:19 -0000 1.3 *************** *** 17,21 **** /** - * @class PpmWriter * A PPM image file writer. Dimensions are known from the {\em Image} * object. Only PPM version 6 is supported. --- 17,20 ---- Index: PfcReader.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage/PfcReader.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PfcReader.hh 3 Jun 2005 14:02:03 -0000 1.2 --- PfcReader.hh 12 Jul 2005 14:52:18 -0000 1.3 *************** *** 17,21 **** /** - * @class PfcReader * A PFC file reader. Only PFCs version 6 are supported. */ --- 17,20 ---- |
|
From: Herbert M. D. <he...@us...> - 2005-07-12 14:52:30
|
Update of /cvsroot/wavelet/Wavelet/WTools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21335/WTools Modified Files: Histogram.hh ImageComparison.hh ImageDenoiser.hh ImageInformation.hh NTree.hh PyramidTree.hh Log Message: Fixed doxygen documentation. Index: NTree.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WTools/NTree.hh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** NTree.hh 3 Jun 2005 14:02:04 -0000 1.5 --- NTree.hh 12 Jul 2005 14:52:19 -0000 1.6 *************** *** 23,27 **** /** - * @class NTree * A class for n-ary trees. Rather relaxed attitude towards position * checking; crashes are avoided but errors not always flagged! --- 23,26 ---- Index: Histogram.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WTools/Histogram.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Histogram.hh 3 Jun 2005 14:02:04 -0000 1.2 --- Histogram.hh 12 Jul 2005 14:52:19 -0000 1.3 *************** *** 17,21 **** /** - * @class Histogram * A class for histograms. */ --- 17,20 ---- Index: ImageComparison.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WTools/ImageComparison.hh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ImageComparison.hh 3 Jun 2005 14:02:04 -0000 1.3 --- ImageComparison.hh 12 Jul 2005 14:52:19 -0000 1.4 *************** *** 36,40 **** /** - * @class ImageComparison * A class for differences between two images */ --- 36,39 ---- Index: ImageInformation.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WTools/ImageInformation.hh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ImageInformation.hh 3 Jun 2005 14:02:04 -0000 1.3 --- ImageInformation.hh 12 Jul 2005 14:52:19 -0000 1.4 *************** *** 29,33 **** /** - * @class ImageInformation * Image information. The information consists coefficient information * nodes, so the original image can be reconstructed from this. Tool --- 29,32 ---- Index: PyramidTree.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WTools/PyramidTree.hh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PyramidTree.hh 3 Jun 2005 14:02:04 -0000 1.3 --- PyramidTree.hh 12 Jul 2005 14:52:19 -0000 1.4 *************** *** 19,23 **** /** - * @class PyramidTree * A class for pyramid trees. Rather relaxed attitude towards position * checking; crashes are avoided but errors not always flagged! --- 19,22 ---- Index: ImageDenoiser.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WTools/ImageDenoiser.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ImageDenoiser.hh 3 Jun 2005 14:02:04 -0000 1.2 --- ImageDenoiser.hh 12 Jul 2005 14:52:19 -0000 1.3 *************** *** 32,36 **** /** - * @class ImageDenoiser * A simple DWT-based image denoiser. It uses the same tree structure as in * Shapiro's Zerotree compression algorithm. Denoising means reducing the --- 32,35 ---- |
Update of /cvsroot/wavelet/Wavelet/Wave In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21335/Wave Modified Files: Filter.hh MirrorPosition.hh PeriodicPosition.hh PyramidTransform.hh StandardTransform.hh VectorPosition.hh Wavelet.hh WaveletTransform.hh Log Message: Fixed doxygen documentation. Index: Wavelet.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/Wave/Wavelet.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Wavelet.hh 3 Jun 2005 14:02:04 -0000 1.2 --- Wavelet.hh 12 Jul 2005 14:52:20 -0000 1.3 *************** *** 19,23 **** /** - * @class Wavelet * A Wavelet. The Wavelet transform is one-dimensional, it * thus works on vectors. --- 19,22 ---- Index: VectorPosition.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/Wave/VectorPosition.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** VectorPosition.hh 3 Jun 2005 14:02:04 -0000 1.2 --- VectorPosition.hh 12 Jul 2005 14:52:20 -0000 1.3 *************** *** 17,21 **** /** - * @class VectorPosition * A Vector index (abstract). Performs symmetric, periodic and whatever * extensions to a vector or a part of it. --- 17,20 ---- Index: PyramidTransform.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/Wave/PyramidTransform.hh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PyramidTransform.hh 3 Jun 2005 14:02:04 -0000 1.4 --- PyramidTransform.hh 12 Jul 2005 14:52:20 -0000 1.5 *************** *** 18,22 **** /** - * @class PyramidTransform * A Pyramid Transform. The transform is two-dimensional, * it thus works on images. --- 18,21 ---- Index: PeriodicPosition.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/Wave/PeriodicPosition.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PeriodicPosition.hh 3 Jun 2005 14:02:04 -0000 1.2 --- PeriodicPosition.hh 12 Jul 2005 14:52:20 -0000 1.3 *************** *** 17,21 **** /** - * @class PeriodicPosition * A Periodic index (abstract). Performs symmetric, periodic and whatever * extensions to a vector or a part of it. --- 17,20 ---- Index: StandardTransform.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/Wave/StandardTransform.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** StandardTransform.hh 3 Jun 2005 14:02:04 -0000 1.2 --- StandardTransform.hh 12 Jul 2005 14:52:20 -0000 1.3 *************** *** 17,21 **** /** - * @class StandardTransform * A Standard Transform. The transform is two-dimensional, * it thus works on images. --- 17,20 ---- Index: WaveletTransform.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/Wave/WaveletTransform.hh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** WaveletTransform.hh 3 Jun 2005 14:02:04 -0000 1.3 --- WaveletTransform.hh 12 Jul 2005 14:52:20 -0000 1.4 *************** *** 20,24 **** /** - * @class WaveletTransform * An abstract Wavelet Transform. The Transform transform is two-dimensional, * it thus works on images. --- 20,23 ---- Index: Filter.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/Wave/Filter.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Filter.hh 3 Jun 2005 14:02:04 -0000 1.2 --- Filter.hh 12 Jul 2005 14:52:20 -0000 1.3 *************** *** 13,17 **** /*---------------------------------------------------------------------------*/ /** - * @class Filter * * Originally this was wavelet.hh from Geoff Davis' Wavelet construction kit. --- 13,16 ---- *************** *** 72,76 **** /** - * @class FilterSet * * Originally this was wavelet.hh from Geoff Davis' Wavelet construction kit. --- 71,74 ---- Index: MirrorPosition.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/Wave/MirrorPosition.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MirrorPosition.hh 3 Jun 2005 14:02:04 -0000 1.2 --- MirrorPosition.hh 12 Jul 2005 14:52:20 -0000 1.3 *************** *** 17,21 **** /** - * @class MirrorPosition * A Mirror index (abstract). Performs symmetric, periodic and whatever * extensions to a vector or a part of it. --- 17,20 ---- |
|
From: Herbert M. D. <he...@us...> - 2005-07-12 14:52:28
|
Update of /cvsroot/wavelet/Wavelet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21335 Modified Files: Doxyfile.in WImage.hh WTools.hh Wave.hh ppmlib.h Log Message: Fixed doxygen documentation. Index: ppmlib.h =================================================================== RCS file: /cvsroot/wavelet/Wavelet/ppmlib.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ppmlib.h 19 Oct 2004 13:55:36 -0000 1.1 --- ppmlib.h 12 Jul 2005 14:52:18 -0000 1.2 *************** *** 9,13 **** #ifndef PPMLIB_H__ #define PPMLIB_H__ ! /** @addtogroup WImage */ #include "WImage/miscdefs.h" --- 9,14 ---- #ifndef PPMLIB_H__ #define PPMLIB_H__ ! ! /** @ingroup WImage */ #include "WImage/miscdefs.h" Index: Wave.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/Wave.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Wave.hh 3 Jun 2005 14:02:01 -0000 1.2 --- Wave.hh 12 Jul 2005 14:52:18 -0000 1.3 *************** *** 11,17 **** #define WAVE_HH__ /** ! * @defgroup Wave Classes for Wavelet Transforms ! * @brief Classes for Wavlet Transforms * * The classes in the group Wave deal with performing Wavelet transforms --- 11,19 ---- #define WAVE_HH__ + /** @defgroup Wave Classes for Wavelet Transforms */ + /** ! * @ingroup Wave ! * @brief Classes for Wavelet Transforms * * The classes in the group Wave deal with performing Wavelet transforms Index: WTools.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WTools.hh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WTools.hh 3 Jun 2005 14:02:01 -0000 1.2 --- WTools.hh 12 Jul 2005 14:52:18 -0000 1.3 *************** *** 11,16 **** #define WTOOLS_HH__ /** ! * @defgroup WTools Utilities for images and Wavelet Transforms * @brief Wavelet-based image tools * --- 11,18 ---- #define WTOOLS_HH__ + /** @defgroup WTools Utilities for images and Wavelet Transforms */ + /** ! * @ingroup WTools * @brief Wavelet-based image tools * Index: Doxyfile.in =================================================================== RCS file: /cvsroot/wavelet/Wavelet/Doxyfile.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Doxyfile.in 27 Jan 2005 13:38:37 -0000 1.4 --- Doxyfile.in 12 Jul 2005 14:52:17 -0000 1.5 *************** *** 55,61 **** # configuration options related to the input files #--------------------------------------------------------------------------- ! INPUT = . FILE_PATTERNS = *.hh *.h ! RECURSIVE = YES EXCLUDE = ./debian EXCLUDE_SYMLINKS = NO --- 55,61 ---- # configuration options related to the input files #--------------------------------------------------------------------------- ! INPUT = WImage.hh Wave.hh WTools.hh . WImage Wave WTools FILE_PATTERNS = *.hh *.h ! RECURSIVE = NO EXCLUDE = ./debian EXCLUDE_SYMLINKS = NO Index: WImage.hh =================================================================== RCS file: /cvsroot/wavelet/Wavelet/WImage.hh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** WImage.hh 3 Jun 2005 14:02:01 -0000 1.5 --- WImage.hh 12 Jul 2005 14:52:18 -0000 1.6 *************** *** 11,16 **** #define WIMAGE_HH__ /** ! * @defgroup WImage Classes for images * @brief Image classes and tools * --- 11,18 ---- #define WIMAGE_HH__ + /** @defgroup WImage Classes for images */ + /** ! * @ingroup WImage * @brief Image classes and tools * |
